diff options
Diffstat (limited to '0017-icu-config-versioning.patch')
| -rw-r--r-- | 0017-icu-config-versioning.patch | 65 |
1 files changed, 34 insertions, 31 deletions
diff --git a/0017-icu-config-versioning.patch b/0017-icu-config-versioning.patch index 130b61ce5ecd..5f9c0f8d0c45 100644 --- a/0017-icu-config-versioning.patch +++ b/0017-icu-config-versioning.patch @@ -1,6 +1,33 @@ ---- icu/source/config/mh-mingw.orig 2015-07-29 14:31:54.664667600 +0300 -+++ icu/source/config/mh-mingw 2015-07-29 14:34:19.771155500 +0300 -@@ -75,13 +75,16 @@ +diff -Naur icu-orig/source/config/Makefile.inc.in icu/source/config/Makefile.inc.in +--- icu-orig/source/config/Makefile.inc.in 2016-09-10 00:28:18.000000000 +0300 ++++ icu/source/config/Makefile.inc.in 2018-03-01 10:09:29.643444500 +0300 +@@ -106,14 +106,14 @@ + # - $(ICULIBS_I18N) - i18n library, formatting, etc. + # - $(ICULIBS_ICUIO) - ICU stdio equivalent library + +-ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) +-ICULIBS_DATA = -l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) +-ICULIBS_I18N = -l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) +-ICULIBS_TOOLUTIL = -l$(ICUPREFIX)tu$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) +-ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) +-ICULIBS_ICUIO = -l$(ICUPREFIX)io$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) +-ICULIBS_OBSOLETE = -l$(ICUPREFIX)obsolete$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) +-ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) ++ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX) ++ICULIBS_DATA = -l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX) ++ICULIBS_I18N = -l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX) ++ICULIBS_TOOLUTIL = -l$(ICUPREFIX)tu$(ICULIBSUFFIX) ++ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX) ++ICULIBS_ICUIO = -l$(ICUPREFIX)io$(ICULIBSUFFIX) ++ICULIBS_OBSOLETE = -l$(ICUPREFIX)obsolete$(ICULIBSUFFIX) ++ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX) + ICULIBS_BASE = -L$(libdir) + + # for icu-config to test with +diff -Naur icu-orig/source/config/mh-mingw icu/source/config/mh-mingw +--- icu-orig/source/config/mh-mingw 2018-03-01 10:09:24.339435200 +0300 ++++ icu/source/config/mh-mingw 2018-03-01 10:09:29.627844500 +0300 +@@ -77,13 +77,16 @@ I18N_STUBNAME = in LIBICU = $(LIBPREFIX)$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX) @@ -19,9 +46,10 @@ #SH# #SH## ICULIBS is the set of libraries your application should link #SH## with usually. Many applications will want to add ${ICULIBS_I18N} as well. ---- icu/source/config/mh-mingw64.orig 2015-07-29 14:32:09.885145400 +0300 -+++ icu/source/config/mh-mingw64 2015-07-29 14:34:34.344698000 +0300 -@@ -75,13 +75,16 @@ +diff -Naur icu-orig/source/config/mh-mingw64 icu/source/config/mh-mingw64 +--- icu-orig/source/config/mh-mingw64 2018-03-01 10:09:24.339435200 +0300 ++++ icu/source/config/mh-mingw64 2018-03-01 10:09:29.627844500 +0300 +@@ -77,13 +77,16 @@ I18N_STUBNAME = in LIBICU = $(LIBPREFIX)$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX) @@ -40,28 +68,3 @@ #SH# #SH## ICULIBS is the set of libraries your application should link #SH## with usually. Many applications will want to add ${ICULIBS_I18N} as well. ---- icu/source/config/Makefile.inc.in.orig 2015-07-29 14:34:44.358696500 +0300 -+++ icu/source/config/Makefile.inc.in 2015-07-29 14:35:15.641567900 +0300 -@@ -106,14 +106,14 @@ - # - $(ICULIBS_LAYOUT) - ICU layout library. - # - $(ICULIBS_ICUIO) - ICU stdio equivalent library - --ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) --ICULIBS_DATA = -l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) --ICULIBS_I18N = -l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) --ICULIBS_TOOLUTIL = -l$(ICUPREFIX)tu$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) --ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) --ICULIBS_ICUIO = -l$(ICUPREFIX)io$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) --ICULIBS_OBSOLETE = -l$(ICUPREFIX)obsolete$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) --ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) -+ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX) -+ICULIBS_DATA = -l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX) -+ICULIBS_I18N = -l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX) -+ICULIBS_TOOLUTIL = -l$(ICUPREFIX)tu$(ICULIBSUFFIX) -+ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX) -+ICULIBS_ICUIO = -l$(ICUPREFIX)io$(ICULIBSUFFIX) -+ICULIBS_OBSOLETE = -l$(ICUPREFIX)obsolete$(ICULIBSUFFIX) -+ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX) - ICULIBS_BASE = -L$(libdir) - - # for icu-config to test with |