summarylogtreecommitdiffstats
path: root/0014-mingwize-pkgdata.mingw.patch
diff options
context:
space:
mode:
Diffstat (limited to '0014-mingwize-pkgdata.mingw.patch')
-rw-r--r--0014-mingwize-pkgdata.mingw.patch18
1 files changed, 10 insertions, 8 deletions
diff --git a/0014-mingwize-pkgdata.mingw.patch b/0014-mingwize-pkgdata.mingw.patch
index 051673c62f69..968a42d096e5 100644
--- a/0014-mingwize-pkgdata.mingw.patch
+++ b/0014-mingwize-pkgdata.mingw.patch
@@ -1,6 +1,7 @@
---- icu/source/tools/pkgdata/pkgdata.cpp.orig 2013-10-04 20:49:38.000000000 +0000
-+++ icu/source/tools/pkgdata/pkgdata.cpp 2014-02-06 19:09:43.258525500 +0000
-@@ -868,21 +868,10 @@
+diff -Naur icu-orig/source/tools/pkgdata/pkgdata.cpp icu/source/tools/pkgdata/pkgdata.cpp
+--- icu-orig/source/tools/pkgdata/pkgdata.cpp 2016-06-15 21:58:17.000000000 +0300
++++ icu/source/tools/pkgdata/pkgdata.cpp 2018-03-01 10:09:24.760635900 +0300
+@@ -893,21 +893,9 @@
const char* FILE_EXTENSION_SEP = uprv_strlen(pkgDataFlags[SO_EXT]) == 0 ? "" : ".";
const char* FILE_SUFFIX = pkgDataFlags[LIB_EXT_ORDER][0] == '.' ? "." : "";
@@ -9,7 +10,8 @@
- if (IN_DLL_MODE(mode)) {
- sprintf(libFileNames[LIB_FILE], "%s", libName);
- } else {
-- sprintf(libFileNames[LIB_FILE], "%s%s",
+- sprintf(libFileNames[LIB_FILE], "%s%s%s",
+- (strstr(libName, "icudt") ? "lib" : ""),
- pkgDataFlags[LIBPREFIX],
- libName);
- }
@@ -21,10 +23,10 @@
if(o->verbose) {
fprintf(stdout, "# libFileName[LIB_FILE] = %s\n", libFileNames[LIB_FILE]);
- }
---- icu/source/tools/pkgdata/pkgtypes.h.orig 2013-10-04 20:49:38.000000000 +0000
-+++ icu/source/tools/pkgdata/pkgtypes.h 2014-02-06 19:10:24.970822300 +0000
-@@ -138,10 +138,10 @@
+diff -Naur icu-orig/source/tools/pkgdata/pkgtypes.h icu/source/tools/pkgdata/pkgtypes.h
+--- icu-orig/source/tools/pkgdata/pkgtypes.h 2016-06-15 21:58:17.000000000 +0300
++++ icu/source/tools/pkgdata/pkgtypes.h 2018-03-01 10:09:24.760635900 +0300
+@@ -140,10 +140,10 @@
# ifndef UDATA_SO_SUFFIX
# define UDATA_SO_SUFFIX ".dll"
# endif