diff --git a/src/icu4c-3-detect-host.patch b/src/icu4c-3-detect-host.patch new file mode 100644 index 00000000..a02f860d --- /dev/null +++ b/src/icu4c-3-detect-host.patch @@ -0,0 +1,15 @@ +This file is part of MXE. +See index.html for further information. + +diff -ur icu.orig/source/acinclude.m4 icu/source/acinclude.m4 +--- icu.orig/source/acinclude.m4 2014-04-20 22:05:23.000000000 +1000 ++++ icu/source/acinclude.m4 2014-04-20 22:06:17.000000000 +1000 +@@ -32,7 +32,7 @@ + icu_cv_host_frag=mh-linux-va + fi ;; + *-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) icu_cv_host_frag=mh-linux ;; +-*-*-cygwin|*-*-mingw32|*-*-mingw64) ++*-*-cygwin|*-*-mingw*) + if test "$GCC" = yes; then + AC_TRY_COMPILE([ + #ifndef __MINGW32__ diff --git a/src/icu4c.mk b/src/icu4c.mk index 4de78b94..cb86504a 100644 --- a/src/icu4c.mk +++ b/src/icu4c.mk @@ -19,6 +19,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD_SHARED + cd '$(1)/source' && autoreconf -fi mkdir '$(1).native' && cd '$(1).native' && '$(1)/source/configure' \ CC=gcc CXX=g++ $(MAKE) -C '$(1).native' -j '$(JOBS)' @@ -26,7 +27,6 @@ define $(PKG)_BUILD_SHARED mkdir '$(1).cross' && cd '$(1).cross' && '$(1)/source/configure' \ $(MXE_CONFIGURE_OPTS) \ --with-cross-build='$(1).native' \ - icu_cv_host_frag=mh-mingw \ CFLAGS=-DU_USING_ICU_NAMESPACE=0 \ CXXFLAGS='--std=gnu++0x' \ SHELL=bash