summaryrefslogtreecommitdiff
path: root/Build/source/libs/icu/TLpatches/patch-12-mingw
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-01-08 19:24:46 +0000
committerKarl Berry <karl@freefriends.org>2019-01-08 19:24:46 +0000
commit3eec52e2f37fb5ad2e6de4ec20cb26ff280777a1 (patch)
tree206a748c51d12870ca8426c9d7a59a11639d87b2 /Build/source/libs/icu/TLpatches/patch-12-mingw
parent730f4601e0de27c5eccd405e393f80425fa6cdf2 (diff)
icu 63.1
git-svn-id: svn://tug.org/texlive/trunk@49641 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/icu/TLpatches/patch-12-mingw')
-rw-r--r--Build/source/libs/icu/TLpatches/patch-12-mingw58
1 files changed, 30 insertions, 28 deletions
diff --git a/Build/source/libs/icu/TLpatches/patch-12-mingw b/Build/source/libs/icu/TLpatches/patch-12-mingw
index 21b655ae324..fb3ef8e77ff 100644
--- a/Build/source/libs/icu/TLpatches/patch-12-mingw
+++ b/Build/source/libs/icu/TLpatches/patch-12-mingw
@@ -1,30 +1,32 @@
We don't want this for TeX Live cross compilation.
---- source/config/mh-mingw.ORIG 2018-03-26 06:38:44.000000000 -0700
-+++ source/config/mh-mingw 2018-03-28 15:37:03.292751066 -0700
-@@ -66,25 +66,7 @@
- STATIC_O = ao
-
--ifeq ($(ENABLE_SHARED),YES)
--SO_TARGET_VERSION_SUFFIX = $(SO_TARGET_VERSION_MAJOR)
--else
--SO_TARGET_VERSION_SUFFIX =
--endif
--
--# Static library prefix and file extension
--LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
--A = a
--
- ## An import library is needed for z/OS and MSVC
- IMPORT_LIB_EXT = .dll.a
-
--LIBPREFIX=lib
--
--# Change the stubnames so that poorly working FAT disks and installation programs can work.
--# This is also for backwards compatibility.
--DATA_STUBNAME = dt
--I18N_STUBNAME = in
--LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
--
- #SH### copied from Makefile.inc
- #SH## for icu-config to test with
+*** source/config/mh-mingw~ Mon Oct 1 15:39:56 2018
+--- source/config/mh-mingw Tue Jan 8 10:16:08 2019
+***************
+*** 71,95 ****
+ STATIC_O = ao
+
+- ifeq ($(ENABLE_SHARED),YES)
+- SO_TARGET_VERSION_SUFFIX = $(SO_TARGET_VERSION_MAJOR)
+- else
+- SO_TARGET_VERSION_SUFFIX =
+- endif
+-
+- # Static library prefix and file extension
+- LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
+- A = a
+-
+ ## An import library is needed for z/OS and MSVC
+ IMPORT_LIB_EXT = .dll.a
+
+- LIBPREFIX=lib
+-
+- # Change the stubnames so that poorly working FAT disks and installation programs can work.
+- # This is also for backwards compatibility.
+- DATA_STUBNAME = dt
+- I18N_STUBNAME = in
+- LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
+-
+ #SH### copied from Makefile.inc
+ #SH## for icu-config to test with
+--- 71,77 ----