File icu4c-74_2-add-lib-prefix-to-dll.patch of Package mingw64-icu
diff -ru icu.orig/source/common/Makefile.in icu/source/common/Makefile.in --- icu.orig/source/common/Makefile.in 2023-12-11 23:27:41.000000000 +0100 +++ icu/source/common/Makefile.in 2024-03-08 00:02:48.674855995 +0100 @@ -37,7 +37,7 @@ endif ifneq ($(ENABLE_SHARED),) -SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO) +SO_TARGET = $(LIBDIR)/$(LIBPREFIX)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO) ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT) ifeq ($(ENABLE_SO_VERSION_DATA),1) diff -ru icu.orig/source/config/mh-mingw icu/source/config/mh-mingw --- icu.orig/source/config/mh-mingw 2023-12-11 23:27:41.000000000 +0100 +++ icu/source/config/mh-mingw 2024-03-08 00:02:48.674855995 +0100 @@ -60,8 +60,8 @@ LD_SOOPTIONS= ## 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= @@ -168,7 +168,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 -ru icu.orig/source/config/mh-mingw64 icu/source/config/mh-mingw64 --- icu.orig/source/config/mh-mingw64 2023-12-11 23:27:41.000000000 +0100 +++ icu/source/config/mh-mingw64 2024-03-08 00:02:48.674855995 +0100 @@ -60,8 +60,8 @@ LD_SOOPTIONS= ## 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= @@ -82,13 +82,13 @@ 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. @@ -168,7 +168,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# Nur in icu/source/config: mh-mingw64.orig. Nur in icu/source/config: mh-mingw.orig. diff -ru icu.orig/source/i18n/Makefile.in icu/source/i18n/Makefile.in --- icu.orig/source/i18n/Makefile.in 2023-12-11 23:27:41.000000000 +0100 +++ icu/source/i18n/Makefile.in 2024-03-08 00:02:48.674855995 +0100 @@ -33,7 +33,7 @@ endif ifneq ($(ENABLE_SHARED),) -SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO) +SO_TARGET = $(LIBDIR)/$(LIBPREFIX)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO) ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT) ifeq ($(ENABLE_SO_VERSION_DATA),1) diff -ru icu.orig/source/io/Makefile.in icu/source/io/Makefile.in --- icu.orig/source/io/Makefile.in 2023-12-11 23:27:41.000000000 +0100 +++ icu/source/io/Makefile.in 2024-03-08 00:02:48.674855995 +0100 @@ -33,7 +33,7 @@ endif ifneq ($(ENABLE_SHARED),) -SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO) +SO_TARGET = $(LIBDIR)/$(LIBPREFIX)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO) ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT) ifeq ($(ENABLE_SO_VERSION_DATA),1) diff -ru icu.orig/source/layoutex/Makefile.in icu/source/layoutex/Makefile.in --- icu.orig/source/layoutex/Makefile.in 2023-12-11 23:27:41.000000000 +0100 +++ icu/source/layoutex/Makefile.in 2024-03-08 00:02:48.674855995 +0100 @@ -32,7 +32,7 @@ endif ifneq ($(ENABLE_SHARED),) -SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO) +SO_TARGET = $(LIBDIR)/$(LIBPREFIX)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO) ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT) ifeq ($(ENABLE_SO_VERSION_DATA),1) diff -ru icu.orig/source/stubdata/Makefile.in icu/source/stubdata/Makefile.in --- icu.orig/source/stubdata/Makefile.in 2023-12-11 23:27:41.000000000 +0100 +++ icu/source/stubdata/Makefile.in 2024-03-08 00:02:48.674855995 +0100 @@ -34,7 +34,7 @@ ifneq ($(ENABLE_SHARED),) -SO_TARGET = $(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO) +SO_TARGET = $(STUBDATA_LIBDIR)$(LIBPREFIX)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO) ALL_SO_TARGETS = $(FINAL_SO_TARGET) $(MIDDLE_SO_TARGET) $(SO_TARGET) $(BATCH_STUB_TARGET) $(SHARED_OBJECT) endif diff -ru icu.orig/source/tools/ctestfw/Makefile.in icu/source/tools/ctestfw/Makefile.in --- icu.orig/source/tools/ctestfw/Makefile.in 2023-12-11 23:27:41.000000000 +0100 +++ icu/source/tools/ctestfw/Makefile.in 2024-03-08 00:02:48.674855995 +0100 @@ -33,7 +33,7 @@ endif ifneq ($(ENABLE_SHARED),) -SO_TARGET = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO) +SO_TARGET = $(LIBPREFIX)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO) ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT) endif diff -ru icu.orig/source/tools/toolutil/Makefile.in icu/source/tools/toolutil/Makefile.in --- icu.orig/source/tools/toolutil/Makefile.in 2023-12-11 23:27:41.000000000 +0100 +++ icu/source/tools/toolutil/Makefile.in 2024-03-08 00:02:48.674855995 +0100 @@ -33,7 +33,7 @@ endif ifneq ($(ENABLE_SHARED),) -SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO) +SO_TARGET = $(LIBDIR)/$(LIBPREFIX)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO) ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT) endif
