43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
--- icu/source/tools/pkgdata/pkgdata.cpp.orig 2023-08-03 08:20:43.114607100 +0200
|
|
+++ icu/source/tools/pkgdata/pkgdata.cpp 2023-08-03 08:21:22.377282700 +0200
|
|
@@ -926,21 +926,9 @@
|
|
const char* FILE_EXTENSION_SEP = uprv_strlen(pkgDataFlags[SO_EXT]) == 0 ? "" : ".";
|
|
const char* FILE_SUFFIX = pkgDataFlags[LIB_EXT_ORDER][0] == '.' ? "." : "";
|
|
|
|
-#if U_PLATFORM == U_PF_MINGW
|
|
- /* MinGW does not need the library prefix when building in dll mode. */
|
|
- if (IN_DLL_MODE(mode)) {
|
|
- snprintf(libFileNames[LIB_FILE], sizeof(libFileNames[LIB_FILE]), "%s", libName);
|
|
- } else {
|
|
- snprintf(libFileNames[LIB_FILE], sizeof(libFileNames[LIB_FILE]), "%s%s%s",
|
|
- (strstr(libName, "icudt") ? "lib" : ""),
|
|
- pkgDataFlags[LIBPREFIX],
|
|
- libName);
|
|
- }
|
|
-#else
|
|
snprintf(libFileNames[LIB_FILE], sizeof(libFileNames[LIB_FILE]), "%s%s",
|
|
pkgDataFlags[LIBPREFIX],
|
|
libName);
|
|
-#endif
|
|
|
|
if(o->verbose) {
|
|
fprintf(stdout, "# libFileName[LIB_FILE] = %s\n", libFileNames[LIB_FILE]);
|
|
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
|
|
-# define LIB_PREFIX ""
|
|
-# define LIB_STATIC_PREFIX ""
|
|
-# define OBJ_SUFFIX ".obj"
|
|
-# define UDATA_LIB_SUFFIX ".lib"
|
|
+# define LIB_PREFIX "lib"
|
|
+# define LIB_STATIC_PREFIX "lib"
|
|
+# define OBJ_SUFFIX ".o"
|
|
+# define UDATA_LIB_SUFFIX ".a"
|
|
|
|
#elif U_PLATFORM == U_PF_CYGWIN
|
|
# define LIB_PREFIX "cyg"
|