diff options
Diffstat (limited to '0012-libprefix.mingw.patch')
| -rw-r--r-- | 0012-libprefix.mingw.patch | 92 |
1 files changed, 92 insertions, 0 deletions
diff --git a/0012-libprefix.mingw.patch b/0012-libprefix.mingw.patch new file mode 100644 index 000000000000..7f01e93d4129 --- /dev/null +++ b/0012-libprefix.mingw.patch @@ -0,0 +1,92 @@ +diff -urN icu.orig/source/config/mh-mingw icu/source/config/mh-mingw +--- icu.orig/source/config/mh-mingw 2014-04-17 22:21:37.195201800 +0100 ++++ icu/source/config/mh-mingw 2014-04-17 22:09:02.956061800 +0100 +@@ -39,8 +39,8 @@ + LD_SOOPTIONS= -Wl,-Bsymbolic + + ## Commands to make a shared library +-SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)lib$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M# +-SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)lib$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M# ++SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M# ++SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M# + + ## Compiler switch to embed a runtime search path + LD_RPATH= +@@ -61,19 +61,19 @@ + endif + + # Static library prefix and file extension +-LIBSICU = lib$(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) ++LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) + A = a + + ## An import library is needed for z/OS and MSVC + IMPORT_LIB_EXT = .dll.a + +-LIBPREFIX= ++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) ++LIBICU = $(LIBPREFIX)$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX) + + # The #M# is used to delete lines for icu-config + # Current full path directory. +@@ -125,7 +125,7 @@ + FINAL_SO_TARGET=$(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO) + MIDDLE_SO_TARGET=$(FINAL_SO_TARGET) + +-FINAL_IMPORT_LIB = $(dir $(SO_TARGET))lib$(notdir $(basename $(SO_TARGET)))$(IMPORT_LIB_EXT)#M# ++FINAL_IMPORT_LIB = $(dir $(SO_TARGET))$(notdir $(basename $(SO_TARGET)))$(IMPORT_LIB_EXT)#M# + IMPORT_LIB = $(FINAL_IMPORT_LIB)#M# + MIDDLE_IMPORT_LIB = $(FINAL_IMPORT_LIB)#M# + +diff -urN icu.orig/source/config/mh-mingw64 icu/source/config/mh-mingw64 +--- icu.orig/source/config/mh-mingw64 2014-04-17 22:21:37.195201800 +0100 ++++ icu/source/config/mh-mingw64 2014-04-17 22:08:50.428345300 +0100 +@@ -39,8 +39,8 @@ + LD_SOOPTIONS= -Wl,-Bsymbolic + + ## Commands to make a shared library +-SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)lib$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M# +-SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)lib$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M# ++SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M# ++SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M# + + ## Compiler switch to embed a runtime search path + LD_RPATH= +@@ -61,19 +61,19 @@ + endif + + # Static library prefix and file extension +-LIBSICU = lib$(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) ++LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) + A = a + + ## An import library is needed for z/OS and MSVC + IMPORT_LIB_EXT = .dll.a + +-LIBPREFIX= ++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) ++LIBICU = $(LIBPREFIX)$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX) + + # The #M# is used to delete lines for icu-config + # Current full path directory. +@@ -125,7 +125,7 @@ + FINAL_SO_TARGET=$(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO) + MIDDLE_SO_TARGET=$(FINAL_SO_TARGET) + +-FINAL_IMPORT_LIB = $(dir $(SO_TARGET))lib$(notdir $(basename $(SO_TARGET)))$(IMPORT_LIB_EXT)#M# ++FINAL_IMPORT_LIB = $(dir $(SO_TARGET))$(notdir $(basename $(SO_TARGET)))$(IMPORT_LIB_EXT)#M# + IMPORT_LIB = $(FINAL_IMPORT_LIB)#M# + MIDDLE_IMPORT_LIB = $(FINAL_IMPORT_LIB)#M# + |