restructure icu4c build without patch

blur-network · Jul 6, 2019 · 7ffdf4d · 7ffdf4d
1 parent 802c8f7
commit 7ffdf4d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 44 deletions.
diff --git a/contrib/depends/packages/icu4c.mk b/contrib/depends/packages/icu4c.mk
@@ -8,21 +8,29 @@ define $(package)_set_vars
   $(package)_build_opts=CFLAGS="$($(package)_cflags) $($(package)_cppflags) -DU_USING_ICU_NAMESPACE=0 -DU_STATIC_IMPLEMENTATION -DU_COMBINED_IMPLEMENTATION -fPIC -DENABLE_STATIC=YES -DPGKDATA_MODE=static"
 endef
 
+ifeq($(host_os),linux)
 define $(package)_config_cmds
-  patch -p1 < $($(package)_patch_dir)/icu-001-dont-build-static-dynamic-twice.patch &&\
-  mkdir builda &&\
-  mkdir buildb &&\
-  cd builda &&\
+  mkdir build &&\
+  cd build &&\
   sh ../source/runConfigureICU Linux &&\
   make &&\
-  cd ../buildb &&\
-  sh ../source/runConfigureICU MinGW --enable-static=yes --disable-shared --disable-layout --disable-layoutex --disable-tests --disable-samples --prefix=$(host_prefix) --with-cross-build=`pwd`/../builda &&\
   $(MAKE) $($(package)_build_opts)
 endef
+endif
+
+ifeq($(host_os),mingw32)
+define $(package)_config_cmds
+  mkdir build &&\
+  cd ../build &&\
+  sh ../source/runConfigureICU MinGW --enable-static=yes --disable-shared --disable-layout --disable-layoutex --disable-tests --disable-samples --prefix=$(host_prefix) /../build &&\
+  make &&\
+  $(MAKE) $($(package)_build_opts)
+endef
+endif
 
 #define $(package)_build_cmds
 #  cd source &&\
-   $(MAKE) $($((package)_build_opts) `nproc`
+#   $(MAKE) $($((package)_build_opts) `nproc`
 #endef
 
 define $(package)_stage_cmds

diff --git a/contrib/depends/patches/icu4c/icu-001-dont-build-static-dynamic-twice.patch b/contrib/depends/patches/icu4c/icu-001-dont-build-static-dynamic-twice.patch