add icu4c on mingw (#2045)
* add icu4c on mingw * patch mingw to avoid build failure * reapply patch from msys repo * fix icu data issue and checksum issue * fix crossbuild detect on mingw installed on macos * disable package on macos msys environment since the author has no mac device. * fix macos build issue * fix macos build issue * adjust package script * disable cross build test and revert windows change * adjust patch * run reconfigure on mingw * disable mingw on macospull/2062/head
parent
ae28744705
commit
4c3adfbe3e
2 changed files with 68 additions and 2 deletions
@ -0,0 +1,54 @@ |
||||
diff --git a/source/config/mh-mingw b/source/config/mh-mingw
|
||||
index 30f6e5b..7cadf9d 100644
|
||||
--- a/source/config/mh-mingw
|
||||
+++ b/source/config/mh-mingw
|
||||
@@ -15,11 +15,6 @@
|
||||
# If you prefer to have the DLLs in the lib folder, then set this to NO instead.
|
||||
MINGW_MOVEDLLSTOBINDIR = YES
|
||||
|
||||
-# We install sbin tools into the same bin directory because
|
||||
-# pkgdata needs some of the tools in sbin, and we can't always depend on
|
||||
-# icu-config working on Windows.
|
||||
-sbindir=$(bindir)
|
||||
-
|
||||
## Commands to generate dependency files
|
||||
GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS)
|
||||
GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
|
||||
@@ -81,6 +76,10 @@ else
|
||||
SO_TARGET_VERSION_SUFFIX =
|
||||
endif
|
||||
|
||||
+## Remove shared library 's'
|
||||
+STATIC_PREFIX_WHEN_USED =
|
||||
+STATIC_PREFIX =
|
||||
+
|
||||
# Static library prefix and file extension
|
||||
LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
|
||||
A = a
|
||||
diff --git a/source/config/mh-mingw64 b/source/config/mh-mingw64
|
||||
index fb64c56..40b436a 100644
|
||||
--- a/source/config/mh-mingw64
|
||||
+++ b/source/config/mh-mingw64
|
||||
@@ -15,11 +15,6 @@ MINGW_MOVEDLLSTOBINDIR = YES
|
||||
# This file is similar to mh-mingw
|
||||
# Any changes made here may also need to be made in mh-mingw
|
||||
|
||||
-# We install sbin tools into the same bin directory because
|
||||
-# pkgdata needs some of the tools in sbin, and we can't always depend on
|
||||
-# icu-config working on Windows.
|
||||
-sbindir=$(bindir)
|
||||
-
|
||||
## Commands to generate dependency files
|
||||
GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS)
|
||||
GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
|
||||
@@ -81,6 +76,10 @@ else
|
||||
SO_TARGET_VERSION_SUFFIX =
|
||||
endif
|
||||
|
||||
+## Remove shared library 's'
|
||||
+STATIC_PREFIX_WHEN_USED =
|
||||
+STATIC_PREFIX =
|
||||
+
|
||||
# Static library prefix and file extension
|
||||
LIBSICU = lib$(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
|
||||
A = a
|
Loading…
Reference in new issue