diff --git a/contrib/depends/packages/icu4c.mk b/contrib/depends/packages/icu4c.mk index f74f20b..bd990e3 100644 --- a/contrib/depends/packages/icu4c.mk +++ b/contrib/depends/packages/icu4c.mk @@ -1,24 +1,23 @@ package=icu4c -$(package)_version=55.2 -$(package)_download_path=https://github.com/unicode-org/icu/releases/download/release-55-2/ -$(package)_file_name=$(package)-55_2-src.tgz -$(package)_sha256_hash=eda2aa9f9c787748a2e2d310590720ca8bcc6252adf6b4cfb03b65bef9d66759 -$(package)_patches=icu-001-dont-build-static-dynamic-twice.patch no-timestamp-in-makefile.patch +$(package)_version=73.1 +$(package)_download_path=https://github.com/unicode-org/icu/releases/download/release-73-1/ +$(package)_file_name=$(package)-73_1-src.tgz +$(package)_sha256_hash=a457431de164b4aa7eca00ed134d00dfbf88a77c6986a10ae7774fc076bb8c45 +$(package)_patches=icu-001-dont-build-static-dynamic-twice.patch 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" + $(package)_build_opts=CFLAGS="$($(package)_cflags) $($(package)_cppflags) -DU_USING_ICU_NAMESPACE=0 -DU_STATIC_IMPLEMENTATION -fPIC -DENABLE_STATIC=YES -DPGKDATA_MODE=static" endef define $(package)_config_cmds patch -p1 < $($(package)_patch_dir)/icu-001-dont-build-static-dynamic-twice.patch && \ - patch -p1 < $($(package)_patch_dir)/no-timestamp-in-makefile.patch && \ mkdir builda &&\ mkdir buildb &&\ cd builda &&\ 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 &&\ + sh ../source/runConfigureICU MinGW --enable-static=yes --disable-shared --disable-layout --disable-layoutex --disable-tests --disable-tools --disable-samples --prefix=$(host_prefix) --with-cross-build=`pwd`/../builda &&\ $(MAKE) $($(package)_build_opts) endef diff --git a/contrib/depends/patches/icu4c/no-timestamp-in-makefile.patch b/contrib/depends/patches/icu4c/no-timestamp-in-makefile.patch deleted file mode 100644 index c439632..0000000 --- a/contrib/depends/patches/icu4c/no-timestamp-in-makefile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/source/Makefile.in b/source/Makefile.in -index 9db6c52..b5a4ea3 100644 ---- a/source/Makefile.in -+++ b/source/Makefile.in -@@ -335,7 +335,6 @@ $(top_builddir)/config/icu-config: $(top_builddir)/Makefile $(top_srcdir)/config - LC_ALL=C sed -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@ - LC_ALL=C sed -f $(top_srcdir)/config/make2sh.sed < @platform_make_fragment@ | grep -v '#M#' | uniq >> $@ - cat $(top_srcdir)/config/icu-config-bottom >> $@ -- echo "# Rebuilt on "`date` >> $@ - chmod u-w $@ - - config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h