Skip to content

Commit 8deeb90

Browse files
dg0ytfwcd
authored andcommitted
[icu] Fix wasm, fix icudt for almost-native builds (microsoft#35529)
1 parent 41f668c commit 8deeb90

5 files changed

Lines changed: 32 additions & 3 deletions

File tree

ports/icu/portfile.cmake

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,22 @@ vcpkg_extract_source_archive(SOURCE_PATH
1919
mingw-dll-install.patch
2020
disable-static-prefix.patch # https://gitlab.kitware.com/cmake/cmake/-/issues/16617; also mingw.
2121
fix-win-build.patch
22+
vcpkg-cross-data.patch
2223
)
2324

2425
vcpkg_find_acquire_program(PYTHON3)
2526
set(ENV{PYTHON} "${PYTHON3}")
2627

28+
vcpkg_list(SET CONFIGURE_OPTIONS)
29+
vcpkg_list(SET CONFIGURE_OPTIONS_RELEASE)
30+
vcpkg_list(SET CONFIGURE_OPTIONS_DEBUG)
31+
vcpkg_list(SET BUILD_OPTIONS)
32+
33+
if(VCPKG_TARGET_IS_EMSCRIPTEN)
34+
vcpkg_list(APPEND CONFIGURE_OPTIONS --disable-extras)
35+
vcpkg_list(APPEND BUILD_OPTIONS "PKGDATA_OPTS=--without-assembly -O ../data/icupkg.inc")
36+
endif()
37+
2738
if(VCPKG_TARGET_IS_WINDOWS)
2839
list(APPEND CONFIGURE_OPTIONS --enable-icu-build-win)
2940
endif()
@@ -144,7 +155,7 @@ if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
144155

145156
endif()
146157

147-
vcpkg_install_make()
158+
vcpkg_install_make(OPTIONS ${BUILD_OPTIONS})
148159

149160
file(REMOVE_RECURSE
150161
"${CURRENT_PACKAGES_DIR}/share"

ports/icu/vcpkg-cross-data.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/source/configure.ac b/source/configure.ac
2+
index 1bd5871..c508f48 100644
3+
--- a/source/configure.ac
4+
+++ b/source/configure.ac
5+
@@ -1151,7 +1151,7 @@ AC_ARG_ENABLE(fuzzer,
6+
fuzzer=false)
7+
ICU_CONDITIONAL(FUZZER, test "$fuzzer" = true)
8+
9+
-ICU_CONDITIONAL(DATA, test "$tools" = true || test "$cross_compiling" = "yes")
10+
+ICU_CONDITIONAL(DATA, test "$tools" = true || test "$cross_compiling" = "yes" || test -n "$cross_buildroot")
11+
12+
AC_ARG_WITH(data-packaging,
13+
[ --with-data-packaging specify how to package ICU data. Possible values:

ports/icu/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "icu",
33
"version": "73.1",
4-
"port-version": 1,
4+
"port-version": 2,
55
"description": "Mature and widely used Unicode and localization library.",
66
"homepage": "https://icu.unicode.org/home",
77
"license": "ICU",

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3322,7 +3322,7 @@
33223322
},
33233323
"icu": {
33243324
"baseline": "73.1",
3325-
"port-version": 1
3325+
"port-version": 2
33263326
},
33273327
"ideviceinstaller": {
33283328
"baseline": "2023-07-21",

versions/i-/icu.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "b6ac20c2420a4f7118d5db326c8c599e50b2c5a4",
5+
"version": "73.1",
6+
"port-version": 2
7+
},
38
{
49
"git-tree": "deb5694d7965a264d6eb579df49aff4fe6362c24",
510
"version": "73.1",

0 commit comments

Comments
 (0)