From 912bd34637e603f9348f02e699fe2764f2ca0bfc Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 17 Jan 2017 15:32:15 +0100 Subject: [PATCH] Patch icu : Do not use a specific name for static libs. --- kiwix-build.py | 1 + patches/icu4c_fix_static_lib_name_mingw.patch | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 patches/icu4c_fix_static_lib_name_mingw.patch diff --git a/kiwix-build.py b/kiwix-build.py index b8fb0b6..cf54d05 100755 --- a/kiwix-build.py +++ b/kiwix-build.py @@ -574,6 +574,7 @@ class Icu(Dependency, ReleaseDownloadMixin, MakeMixin): ) data = Remotefile('icudt56l.dat', 'e23d85eee008f335fc49e8ef37b1bc2b222db105476111e3d16f0007d371cbca') + patches = ["icu4c_fix_static_lib_name_mingw.patch"] configure_option = "--disable-samples --disable-tests --disable-extras --enable-static --disable-dyload" subsource_dir = "source" diff --git a/patches/icu4c_fix_static_lib_name_mingw.patch b/patches/icu4c_fix_static_lib_name_mingw.patch new file mode 100644 index 0000000..3c94e76 --- /dev/null +++ b/patches/icu4c_fix_static_lib_name_mingw.patch @@ -0,0 +1,28 @@ +diff -ur icu4c-56_1/source/config/mh-mingw icu4c-56_1.patched/source/config/mh-mingw +--- icu4c-56_1/source/config/mh-mingw 2015-10-08 05:54:32.000000000 +0200 ++++ icu4c-56_1.patched/source/config/mh-mingw 2017-01-17 15:21:45.344657127 +0100 +@@ -65,6 +65,10 @@ + SO_TARGET_VERSION_SUFFIX = + endif + ++## Remove shared library 's' ++STATIC_PREFIX_WHEN_USED = ++STATIC_PREFIX = ++ + # Static library prefix and file extension + LIBSICU = lib$(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) + A = a +diff -ur icu4c-56_1/source/config/mh-mingw64 icu4c-56_1.patched/source/config/mh-mingw64 +--- icu4c-56_1/source/config/mh-mingw64 2015-10-08 05:54:30.000000000 +0200 ++++ icu4c-56_1.patched/source/config/mh-mingw64 2017-01-17 14:25:14.072632426 +0100 +@@ -65,6 +65,10 @@ + SO_TARGET_VERSION_SUFFIX = + endif + ++## Remove shared library 's' ++STATIC_PREFIX_WHEN_USED = ++STATIC_PREFIX = ++ + # Static library prefix and file extension + LIBSICU = lib$(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) + A = a