texlive[50021] Build/source/libs/icu: copy icudt.a and libicuin.a for

[commits+karl at tug.org]

Revision: 50021
          http://tug.org/svn/texlive?view=revision&revision=50021
Author:   karl
Date:     2019-02-14 01:23:33 +0100 (Thu, 14 Feb 2019)
Log Message:
-----------
copy icudt.a and libicuin.a for mingw cross compile

Modified Paths:
--------------
    trunk/Build/source/libs/icu/ChangeLog
    trunk/Build/source/libs/icu/Makefile.am
    trunk/Build/source/libs/icu/Makefile.in

Modified: trunk/Build/source/libs/icu/ChangeLog
===================================================================
--- trunk/Build/source/libs/icu/ChangeLog	2019-02-13 22:23:27 UTC (rev 50020)
+++ trunk/Build/source/libs/icu/ChangeLog	2019-02-14 00:23:33 UTC (rev 50021)
@@ -1,3 +1,8 @@
+2019-02-14  Karl Berry  <karl at tug.org>
+
+	* Makefile.am (icubuild): cp icudt.a to icudata.a
+	and libicuin.a libicui18n.a, for mingw cross compile, per Luigi.
+
 2019-02-10  Karl Berry  <karl at tug.org>
 
 	* Makefile.am (LDADD) [cross]: icu-native/lib/icudt.a per Luigi.

Modified: trunk/Build/source/libs/icu/Makefile.am
===================================================================
--- trunk/Build/source/libs/icu/Makefile.am	2019-02-13 22:23:27 UTC (rev 50020)
+++ trunk/Build/source/libs/icu/Makefile.am	2019-02-14 00:23:33 UTC (rev 50021)
@@ -57,6 +57,10 @@
 	cd icu-native && $(MAKE) $(AM_MAKEFLAGS) all
 endif cross
 	cd icu-build && $(MAKE) $(AM_MAKEFLAGS) all
+# these two cp commands are a kludge for mingw cross compilation.
+	cd icu-build/lib && (test ! -r icudt.a || cp icudt.a libicudata.a)
+	cd icu-build/lib && (test ! -r libicuin.a || cp libicuin.a libicui18n.a)
+#
 	cd include/unicode && $(MAKE) $(AM_MAKEFLAGS) all
 
 check-makeflags:

Modified: trunk/Build/source/libs/icu/Makefile.in
===================================================================
--- trunk/Build/source/libs/icu/Makefile.in	2019-02-13 22:23:27 UTC (rev 50020)
+++ trunk/Build/source/libs/icu/Makefile.in	2019-02-14 00:23:33 UTC (rev 50021)
@@ -1333,6 +1333,10 @@
 icubuild: icu-build/Makefile check-makeflags
 @cross_TRUE@	cd icu-native && $(MAKE) $(AM_MAKEFLAGS) all
 	cd icu-build && $(MAKE) $(AM_MAKEFLAGS) all
+# these two cp commands are a kludge for mingw cross compilation.
+	cd icu-build/lib && (test ! -r icudt.a || cp icudt.a libicudata.a)
+	cd icu-build/lib && (test ! -r libicuin.a || cp libicuin.a libicui18n.a)
+#
 	cd include/unicode && $(MAKE) $(AM_MAKEFLAGS) all
 
 check-makeflags: