diff options
author | Karl Berry <karl@freefriends.org> | 2019-02-10 23:22:35 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-02-10 23:22:35 +0000 |
commit | 28a154347592fc15db3b95b43082b30833172515 (patch) | |
tree | f75ddc79f98e9c3cf4bccab2b3217d71f819e77d /Build/source/libs | |
parent | 530ad3572dfbfe5a9f3c246bf678689b6b9fb7e4 (diff) |
mingw cross-compilation fixes from lscarso
git-svn-id: svn://tug.org/texlive/trunk@49996 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs')
-rwxr-xr-x | Build/source/libs/configure | 18 | ||||
-rw-r--r-- | Build/source/libs/icu/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/libs/icu/Makefile.am | 8 | ||||
-rw-r--r-- | Build/source/libs/icu/Makefile.in | 7 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-12-mingw | 12 | ||||
-rw-r--r-- | Build/source/libs/icu/icu-src/source/i18n/unicode/numberrangeformatter.h | 2 |
7 files changed, 38 insertions, 18 deletions
diff --git a/Build/source/libs/configure b/Build/source/libs/configure index 52c9e60543f..ae0f598a336 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -3557,31 +3557,23 @@ $as_echo "$as_me: Assuming \`--enable-vlna=$enable_vlna'" >&6;} ;; 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 : 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/ diff --git a/Build/source/libs/icu/ChangeLog b/Build/source/libs/icu/ChangeLog index 56201ab5dce..e98833ceb29 100644 --- a/Build/source/libs/icu/ChangeLog +++ b/Build/source/libs/icu/ChangeLog @@ -1,3 +1,7 @@ +2019-02-10 Karl Berry <karl@tug.org> + + * Makefile.am (LDADD) [cross]: icu-native/lib/icudt.a per Luigi. + 2019-01-08 Karl Berry <karl@freefriends.org> * Import icu-63.1. diff --git a/Build/source/libs/icu/Makefile.am b/Build/source/libs/icu/Makefile.am index 97feca96864..5947e703a70 100644 --- a/Build/source/libs/icu/Makefile.am +++ b/Build/source/libs/icu/Makefile.am @@ -84,7 +84,13 @@ 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 +if cross +LDADD += icu-build/lib/libicuuc.a +else +icu-build/lib/libicudata.a +endif +LDADD += $(ICU_LIBS_EXTRA) # Rebuild rebuild_prereq = diff --git a/Build/source/libs/icu/Makefile.in b/Build/source/libs/icu/Makefile.in index 291223a732f..69488358540 100644 --- a/Build/source/libs/icu/Makefile.in +++ b/Build/source/libs/icu/Makefile.in @@ -89,6 +89,7 @@ build_triplet = @build@ host_triplet = @host@ @build_TRUE@am__append_1 = include/unicode @build_TRUE@check_PROGRAMS = icutest$(EXEEXT) +@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 @@ CONFIG_CLEAN_VPATH_FILES = 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_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -579,7 +579,7 @@ icutest_SOURCES = icutest.c # 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 @@ check-makeflags: distclean-local: rm -rf icu-build icu-native +@cross_FALSE@icu-build/lib/libicudata.a rebuild.stamp: $(rebuild_target) echo timestamp >$@ diff --git a/Build/source/libs/icu/TLpatches/ChangeLog b/Build/source/libs/icu/TLpatches/ChangeLog index 0bf2c3a608f..c5ff53b84f7 100644 --- a/Build/source/libs/icu/TLpatches/ChangeLog +++ b/Build/source/libs/icu/TLpatches/ChangeLog @@ -1,3 +1,8 @@ +2019-02-10 Karl Berry <karl@tug.org> + + * patch-12-mingw: also patch numberrangeformatter.h + for NumberRangeFormatterImpl* on mingw. + 2019-01-08 Karl Berry <karl@freefriends.org> * update for icu-63.1; no substantive changes. diff --git a/Build/source/libs/icu/TLpatches/patch-12-mingw b/Build/source/libs/icu/TLpatches/patch-12-mingw index fb3ef8e77ff..ee175be6951 100644 --- a/Build/source/libs/icu/TLpatches/patch-12-mingw +++ b/Build/source/libs/icu/TLpatches/patch-12-mingw @@ -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 */ diff --git a/Build/source/libs/icu/icu-src/source/i18n/unicode/numberrangeformatter.h b/Build/source/libs/icu/icu-src/source/i18n/unicode/numberrangeformatter.h index 50546839edf..64f6c6ab1c3 100644 --- a/Build/source/libs/icu/icu-src/source/i18n/unicode/numberrangeformatter.h +++ b/Build/source/libs/icu/icu-src/source/i18n/unicode/numberrangeformatter.h @@ -185,7 +185,7 @@ class NumberRangeFormatterImpl; * 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 */ |