texlive[49996] Build/source: mingw cross-compilation fixes from

commits+karl at tug.org commits+karl at tug.org
Mon Feb 11 00:22:35 CET 2019


Revision: 49996
          http://tug.org/svn/texlive?view=revision&revision=49996
Author:   karl
Date:     2019-02-11 00:22:35 +0100 (Mon, 11 Feb 2019)
Log Message:
-----------
mingw cross-compilation fixes from lscarso

Modified Paths:
--------------
    trunk/Build/source/configure
    trunk/Build/source/doc/tlbuild.info
    trunk/Build/source/doc/tlbuild.texi
    trunk/Build/source/libs/configure
    trunk/Build/source/libs/icu/ChangeLog
    trunk/Build/source/libs/icu/Makefile.am
    trunk/Build/source/libs/icu/Makefile.in
    trunk/Build/source/libs/icu/TLpatches/ChangeLog
    trunk/Build/source/libs/icu/TLpatches/patch-12-mingw
    trunk/Build/source/libs/icu/icu-src/source/i18n/unicode/numberrangeformatter.h
    trunk/Build/source/texk/configure
    trunk/Build/source/texk/dvisvgm/Makefile.in
    trunk/Build/source/utils/configure

Modified: trunk/Build/source/configure
===================================================================
--- trunk/Build/source/configure	2019-02-10 23:12:25 UTC (rev 49995)
+++ trunk/Build/source/configure	2019-02-10 23:22:35 UTC (rev 49996)
@@ -4377,7 +4377,8 @@
     ;;
 esac
 
-## utils/xindy/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
+# $Id$
+# utils/xindy/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
 ## configure options and TL libraries required for xindy
 # Check whether --enable-xindy was given.
 if test "${enable_xindy+set}" = set; then :
@@ -4384,24 +4385,15 @@
   enableval=$enable_xindy;
 fi
 case $enable_xindy in #(
-  yes) :
-    if test "x$cross_compiling" = xyes; then :
-  as_fn_error $? "Unable to cross compile xindy" "$LINENO" 5
-fi ;; #(
-  no) :
+  yes|no) :
      ;; #(
   *) :
-    if test "x$cross_compiling" = xyes; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Cross compiling -> \`--disable-xindy'" >&5
-$as_echo "$as_me: Cross compiling -> \`--disable-xindy'" >&6;}
-            enable_xindy=no
-            ac_configure_args="$ac_configure_args '--disable-xindy'"
-          else
+
    enable_xindy=no
      { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xindy=$enable_xindy'" >&5
 $as_echo "$as_me: Assuming \`--enable-xindy=$enable_xindy'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-xindy=$enable_xindy'"
-   fi ;;
+    ;;
 esac
 
 ## utils/xindy/ac/xindy.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/

Modified: trunk/Build/source/doc/tlbuild.info
===================================================================
(Binary files differ)

Modified: trunk/Build/source/doc/tlbuild.texi
===================================================================
--- trunk/Build/source/doc/tlbuild.texi	2019-02-10 23:12:25 UTC (rev 49995)
+++ trunk/Build/source/doc/tlbuild.texi	2019-02-10 23:22:35 UTC (rev 49996)
@@ -696,9 +696,9 @@
 installed versions of @file{tangle}, @file{ctangle}, @file{otangle},
 and @file{tie}.
 
- at cindex @code{xindy} cross compiling impossible
-Building @code{xindy} requires running the host system @file{clisp}
-binary, thus cross compilation is not possible.
+ at cindex @code{xindy} cross compiling requires @code{clisp}
+Building @code{xindy} requires running the host system @code{clisp}
+binary, thus cross compilation is painful, but possible.
 
 @node Installing
 @chapter Installing
@@ -1519,7 +1519,7 @@
 @code{xindy/ac/withenable.ac} contains
 
 @example
-KPSE_ENABLE_PROG([xindy], , [disable native])
+KPSE_ENABLE_PROG([xindy], , [disable])
 m4_include(kpse_TL[utils/xindy/ac/xindy.ac])
 m4_include(kpse_TL[utils/xindy/ac/clisp.ac])
 @end example
@@ -1526,14 +1526,14 @@
 
 @noindent where @code{disable} in the third argument indicates that
 @code{xindy} is only built if explicitly enabled by the user with
- at code{configure --enable-xindy} (the need for @code{clisp} is too
-painful to require by default), and @code{native} disallows cross
-compilation.  The additional fragments @file{ac/xindy.ac} and
- at file{ac/clisp.ac} specify more @code{configure} options to be seen at
-the top level, with @file{ac/xindy.ac} also included by
- at file{configure.ac}.
+ at code{configure --enable-xindy} (the need for @code{clisp} makes it
+too painful to enable by default).
 
+The additional fragments @file{ac/xindy.ac} and @file{ac/clisp.ac}
+specify more @code{configure} options to be seen at the top level,
+with @file{ac/xindy.ac} also included by @file{configure.ac}.
 
+
 @node @code{xdvik} package
 @subsection The @code{xdvik} package in @file{texk/xdvik}
 

Modified: trunk/Build/source/libs/configure
===================================================================
--- trunk/Build/source/libs/configure	2019-02-10 23:12:25 UTC (rev 49995)
+++ trunk/Build/source/libs/configure	2019-02-10 23:22:35 UTC (rev 49996)
@@ -3557,7 +3557,8 @@
     ;;
 esac
 
-## utils/xindy/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
+# $Id$
+# utils/xindy/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
 ## configure options and TL libraries required for xindy
 # Check whether --enable-xindy was given.
 if test "${enable_xindy+set}" = set; then :
@@ -3564,24 +3565,15 @@
   enableval=$enable_xindy;
 fi
 case $enable_xindy in #(
-  yes) :
-    if test "x$cross_compiling" = xyes; then :
-  as_fn_error $? "Unable to cross compile xindy" "$LINENO" 5
-fi ;; #(
-  no) :
+  yes|no) :
      ;; #(
   *) :
-    if test "x$cross_compiling" = xyes; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Cross compiling -> \`--disable-xindy'" >&5
-$as_echo "$as_me: Cross compiling -> \`--disable-xindy'" >&6;}
-            enable_xindy=no
-            ac_configure_args="$ac_configure_args '--disable-xindy'"
-          else
+
    enable_xindy=no
      { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xindy=$enable_xindy'" >&5
 $as_echo "$as_me: Assuming \`--enable-xindy=$enable_xindy'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-xindy=$enable_xindy'"
-   fi ;;
+    ;;
 esac
 
 ## utils/xindy/ac/xindy.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/

Modified: trunk/Build/source/libs/icu/ChangeLog
===================================================================
--- trunk/Build/source/libs/icu/ChangeLog	2019-02-10 23:12:25 UTC (rev 49995)
+++ trunk/Build/source/libs/icu/ChangeLog	2019-02-10 23:22:35 UTC (rev 49996)
@@ -1,3 +1,7 @@
+2019-02-10  Karl Berry  <karl at tug.org>
+
+	* Makefile.am (LDADD) [cross]: icu-native/lib/icudt.a per Luigi.
+
 2019-01-08  Karl Berry  <karl at freefriends.org>
 
 	* Import icu-63.1.

Modified: trunk/Build/source/libs/icu/Makefile.am
===================================================================
--- trunk/Build/source/libs/icu/Makefile.am	2019-02-10 23:12:25 UTC (rev 49995)
+++ trunk/Build/source/libs/icu/Makefile.am	2019-02-10 23:22:35 UTC (rev 49996)
@@ -84,7 +84,13 @@
 
 icutest_CPPFLAGS = -Iinclude
 
-LDADD = icu-build/lib/libicuuc.a icu-build/lib/libicudata.a $(ICU_LIBS_EXTRA)
+LDADD = icu-build/lib/libicuuc.a
+if cross
+LDADD += icu-build/lib/libicuuc.a
+else
+icu-build/lib/libicudata.a 
+endif
+LDADD += $(ICU_LIBS_EXTRA)
 
 # Rebuild
 rebuild_prereq =

Modified: trunk/Build/source/libs/icu/Makefile.in
===================================================================
--- trunk/Build/source/libs/icu/Makefile.in	2019-02-10 23:12:25 UTC (rev 49995)
+++ trunk/Build/source/libs/icu/Makefile.in	2019-02-10 23:22:35 UTC (rev 49996)
@@ -89,6 +89,7 @@
 host_triplet = @host@
 @build_TRUE at am__append_1 = include/unicode
 @build_TRUE at check_PROGRAMS = icutest$(EXEEXT)
+ at cross_TRUE@am__append_2 = icu-build/lib/libicuuc.a
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -107,8 +108,7 @@
 am_icutest_OBJECTS = icutest-icutest.$(OBJEXT)
 icutest_OBJECTS = $(am_icutest_OBJECTS)
 icutest_LDADD = $(LDADD)
-icutest_DEPENDENCIES = icu-build/lib/libicuuc.a \
-	icu-build/lib/libicudata.a
+icutest_DEPENDENCIES = icu-build/lib/libicuuc.a $(am__append_2)
 am__dist_check_SCRIPTS_DIST = icu.test
 AM_V_P = $(am__v_P_ at AM_V@)
 am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
@@ -579,7 +579,7 @@
 # Force Automake to use CXXLD for linking
 nodist_EXTRA_icutest_SOURCES = dummy.cxx
 icutest_CPPFLAGS = -Iinclude
-LDADD = icu-build/lib/libicuuc.a icu-build/lib/libicudata.a $(ICU_LIBS_EXTRA)
+LDADD = icu-build/lib/libicuuc.a $(am__append_2) $(ICU_LIBS_EXTRA)
 
 # Rebuild
 rebuild_prereq = 
@@ -1343,6 +1343,7 @@
 
 distclean-local:
 	rm -rf icu-build icu-native
+ at cross_FALSE@icu-build/lib/libicudata.a 
 rebuild.stamp: $(rebuild_target)
 	echo timestamp >$@
 

Modified: trunk/Build/source/libs/icu/TLpatches/ChangeLog
===================================================================
--- trunk/Build/source/libs/icu/TLpatches/ChangeLog	2019-02-10 23:12:25 UTC (rev 49995)
+++ trunk/Build/source/libs/icu/TLpatches/ChangeLog	2019-02-10 23:22:35 UTC (rev 49996)
@@ -1,3 +1,8 @@
+2019-02-10  Karl Berry  <karl at tug.org>
+
+	* patch-12-mingw: also patch numberrangeformatter.h
+	for NumberRangeFormatterImpl* on mingw.
+
 2019-01-08  Karl Berry  <karl at freefriends.org>
 
 	* update for icu-63.1; no substantive changes.

Modified: trunk/Build/source/libs/icu/TLpatches/patch-12-mingw
===================================================================
--- trunk/Build/source/libs/icu/TLpatches/patch-12-mingw	2019-02-10 23:12:25 UTC (rev 49995)
+++ trunk/Build/source/libs/icu/TLpatches/patch-12-mingw	2019-02-10 23:22:35 UTC (rev 49996)
@@ -30,3 +30,15 @@
   #SH### copied from Makefile.inc
   #SH## for icu-config to test with
 --- 71,77 ----
+
+--- source/i18n/unicode/numberrangeformatter.h	(revision 49992)
++++ source/i18n/unicode/numberrangeformatter.h	(working copy)
+@@ -185,7 +185,7 @@
+  * Export an explicit template instantiation. See datefmt.h
+  * (When building DLLs for Windows this is required.)
+  */
+-#if U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN && !defined(U_IN_DOXYGEN)
++#if U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM < U_PF_MINGW && !defined(U_IN_DOXYGEN) && defined(X)
+ template struct U_I18N_API std::atomic<impl::NumberRangeFormatterImpl*>;
+ #endif
+ /** \endcond */

Modified: trunk/Build/source/libs/icu/icu-src/source/i18n/unicode/numberrangeformatter.h
===================================================================
--- trunk/Build/source/libs/icu/icu-src/source/i18n/unicode/numberrangeformatter.h	2019-02-10 23:12:25 UTC (rev 49995)
+++ trunk/Build/source/libs/icu/icu-src/source/i18n/unicode/numberrangeformatter.h	2019-02-10 23:22:35 UTC (rev 49996)
@@ -185,7 +185,7 @@
  * Export an explicit template instantiation. See datefmt.h
  * (When building DLLs for Windows this is required.)
  */
-#if U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN && !defined(U_IN_DOXYGEN)
+#if U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM < U_PF_MINGW && !defined(U_IN_DOXYGEN) && defined(X)
 template struct U_I18N_API std::atomic<impl::NumberRangeFormatterImpl*>;
 #endif
 /** \endcond */

Modified: trunk/Build/source/texk/configure
===================================================================
--- trunk/Build/source/texk/configure	2019-02-10 23:12:25 UTC (rev 49995)
+++ trunk/Build/source/texk/configure	2019-02-10 23:22:35 UTC (rev 49996)
@@ -3557,7 +3557,8 @@
     ;;
 esac
 
-## utils/xindy/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
+# $Id$
+# utils/xindy/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
 ## configure options and TL libraries required for xindy
 # Check whether --enable-xindy was given.
 if test "${enable_xindy+set}" = set; then :
@@ -3564,24 +3565,15 @@
   enableval=$enable_xindy;
 fi
 case $enable_xindy in #(
-  yes) :
-    if test "x$cross_compiling" = xyes; then :
-  as_fn_error $? "Unable to cross compile xindy" "$LINENO" 5
-fi ;; #(
-  no) :
+  yes|no) :
      ;; #(
   *) :
-    if test "x$cross_compiling" = xyes; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Cross compiling -> \`--disable-xindy'" >&5
-$as_echo "$as_me: Cross compiling -> \`--disable-xindy'" >&6;}
-            enable_xindy=no
-            ac_configure_args="$ac_configure_args '--disable-xindy'"
-          else
+
    enable_xindy=no
      { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xindy=$enable_xindy'" >&5
 $as_echo "$as_me: Assuming \`--enable-xindy=$enable_xindy'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-xindy=$enable_xindy'"
-   fi ;;
+    ;;
 esac
 
 ## utils/xindy/ac/xindy.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/

Modified: trunk/Build/source/texk/dvisvgm/Makefile.in
===================================================================
--- trunk/Build/source/texk/dvisvgm/Makefile.in	2019-02-10 23:12:25 UTC (rev 49995)
+++ trunk/Build/source/texk/dvisvgm/Makefile.in	2019-02-10 23:22:35 UTC (rev 49996)
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.am 43567 2017-03-21 17:43:10Z karl $
+# $Id: Makefile.am 49882 2019-01-31 18:21:25Z karl $
 # Makefile.am for the TeX Live subdirectory texk/dvisvgm/
 #
 # Copyright 2015-2017 Karl Berry <tex-live at tug.org>

Modified: trunk/Build/source/utils/configure
===================================================================
--- trunk/Build/source/utils/configure	2019-02-10 23:12:25 UTC (rev 49995)
+++ trunk/Build/source/utils/configure	2019-02-10 23:22:35 UTC (rev 49996)
@@ -3557,7 +3557,8 @@
     ;;
 esac
 
-## utils/xindy/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
+# $Id$
+# utils/xindy/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
 ## configure options and TL libraries required for xindy
 # Check whether --enable-xindy was given.
 if test "${enable_xindy+set}" = set; then :
@@ -3564,24 +3565,15 @@
   enableval=$enable_xindy;
 fi
 case $enable_xindy in #(
-  yes) :
-    if test "x$cross_compiling" = xyes; then :
-  as_fn_error $? "Unable to cross compile xindy" "$LINENO" 5
-fi ;; #(
-  no) :
+  yes|no) :
      ;; #(
   *) :
-    if test "x$cross_compiling" = xyes; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Cross compiling -> \`--disable-xindy'" >&5
-$as_echo "$as_me: Cross compiling -> \`--disable-xindy'" >&6;}
-            enable_xindy=no
-            ac_configure_args="$ac_configure_args '--disable-xindy'"
-          else
+
    enable_xindy=no
      { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xindy=$enable_xindy'" >&5
 $as_echo "$as_me: Assuming \`--enable-xindy=$enable_xindy'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-xindy=$enable_xindy'"
-   fi ;;
+    ;;
 esac
 
 ## utils/xindy/ac/xindy.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/



More information about the tex-live-commits mailing list