summaryrefslogtreecommitdiff
path: root/Build/source/libs
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-12-17 16:42:00 +0000
committerKarl Berry <karl@freefriends.org>2021-12-17 16:42:00 +0000
commit3dbbfcc8ae8eafc123d1550de3c9a3ef8ba2ab0b (patch)
treea88a4807fdea71f2fbf9fdf32b1176ba14ee6266 /Build/source/libs
parentf0766d14d2d278ee0a6479b62a45ec03461933d5 (diff)
mingw patches from Siep and Luigi
git-svn-id: svn://tug.org/texlive/trunk@61335 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs')
-rw-r--r--Build/source/libs/icu/ChangeLog5
-rw-r--r--Build/source/libs/icu/Makefile.am6
-rw-r--r--Build/source/libs/icu/Makefile.in4
3 files changed, 10 insertions, 5 deletions
diff --git a/Build/source/libs/icu/ChangeLog b/Build/source/libs/icu/ChangeLog
index bad40c03307..dd196d389d8 100644
--- a/Build/source/libs/icu/ChangeLog
+++ b/Build/source/libs/icu/ChangeLog
@@ -1,3 +1,8 @@
+2021-12-17 Siep Kroonenberg <siepo@bitmuis.nl>
+
+ * Makefile.am (icubuild): sense of test -r lib*.a was reversed.
+ https://tug.org/pipermail/tlbuild/2021q4/004980.html
+
2021-03-01 Karl Berry <karl@freefriends.org>
* icu-src/source/common/putil.cpp [DARWIN]: don't require
diff --git a/Build/source/libs/icu/Makefile.am b/Build/source/libs/icu/Makefile.am
index 93f880cafed..5b9fcc7427d 100644
--- a/Build/source/libs/icu/Makefile.am
+++ b/Build/source/libs/icu/Makefile.am
@@ -1,7 +1,7 @@
## $Id$
## Wrapper Makefile.am to build ICU for TeX Live.
##
-## Copyright 2017 Karl Berry <tex-live@tug.org>
+## Copyright 2017-2021 Karl Berry <tex-live@tug.org>
## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
@@ -58,8 +58,8 @@ if cross
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 icu-build/lib && (test -r libicudata.a || cp libicudt.a libicudata.a || cp icudt.a libicudata.a)
+ cd icu-build/lib && (test -r libicui18n.a || cp libicuin.a libicui18n.a)
#
cd include/unicode && $(MAKE) $(AM_MAKEFLAGS) all
diff --git a/Build/source/libs/icu/Makefile.in b/Build/source/libs/icu/Makefile.in
index 6a62449be93..bc5b30b7c41 100644
--- a/Build/source/libs/icu/Makefile.in
+++ b/Build/source/libs/icu/Makefile.in
@@ -1343,8 +1343,8 @@ 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 icu-build/lib && (test -r libicudata.a || cp libicudt.a libicudata.a || cp icudt.a libicudata.a)
+ cd icu-build/lib && (test -r libicui18n.a || cp libicuin.a libicui18n.a)
#
cd include/unicode && $(MAKE) $(AM_MAKEFLAGS) all