mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-26 17:41:09 +08:00
[icu] Fix wasm, fix icudt for almost-native builds (#35529)
This commit is contained in:
parent
3135b99068
commit
ffc1b51dfb
@ -19,11 +19,22 @@ vcpkg_extract_source_archive(SOURCE_PATH
|
||||
mingw-dll-install.patch
|
||||
disable-static-prefix.patch # https://gitlab.kitware.com/cmake/cmake/-/issues/16617; also mingw.
|
||||
fix-win-build.patch
|
||||
vcpkg-cross-data.patch
|
||||
)
|
||||
|
||||
vcpkg_find_acquire_program(PYTHON3)
|
||||
set(ENV{PYTHON} "${PYTHON3}")
|
||||
|
||||
vcpkg_list(SET CONFIGURE_OPTIONS)
|
||||
vcpkg_list(SET CONFIGURE_OPTIONS_RELEASE)
|
||||
vcpkg_list(SET CONFIGURE_OPTIONS_DEBUG)
|
||||
vcpkg_list(SET BUILD_OPTIONS)
|
||||
|
||||
if(VCPKG_TARGET_IS_EMSCRIPTEN)
|
||||
vcpkg_list(APPEND CONFIGURE_OPTIONS --disable-extras)
|
||||
vcpkg_list(APPEND BUILD_OPTIONS "PKGDATA_OPTS=--without-assembly -O ../data/icupkg.inc")
|
||||
endif()
|
||||
|
||||
if(VCPKG_TARGET_IS_WINDOWS)
|
||||
list(APPEND CONFIGURE_OPTIONS --enable-icu-build-win)
|
||||
endif()
|
||||
@ -144,7 +155,7 @@ if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
|
||||
endif()
|
||||
|
||||
vcpkg_install_make()
|
||||
vcpkg_install_make(OPTIONS ${BUILD_OPTIONS})
|
||||
|
||||
file(REMOVE_RECURSE
|
||||
"${CURRENT_PACKAGES_DIR}/share"
|
||||
|
13
ports/icu/vcpkg-cross-data.patch
Normal file
13
ports/icu/vcpkg-cross-data.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/source/configure.ac b/source/configure.ac
|
||||
index 1bd5871..c508f48 100644
|
||||
--- a/source/configure.ac
|
||||
+++ b/source/configure.ac
|
||||
@@ -1151,7 +1151,7 @@ AC_ARG_ENABLE(fuzzer,
|
||||
fuzzer=false)
|
||||
ICU_CONDITIONAL(FUZZER, test "$fuzzer" = true)
|
||||
|
||||
-ICU_CONDITIONAL(DATA, test "$tools" = true || test "$cross_compiling" = "yes")
|
||||
+ICU_CONDITIONAL(DATA, test "$tools" = true || test "$cross_compiling" = "yes" || test -n "$cross_buildroot")
|
||||
|
||||
AC_ARG_WITH(data-packaging,
|
||||
[ --with-data-packaging specify how to package ICU data. Possible values:
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "icu",
|
||||
"version": "73.1",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "Mature and widely used Unicode and localization library.",
|
||||
"homepage": "https://icu.unicode.org/home",
|
||||
"license": "ICU",
|
||||
|
@ -3386,7 +3386,7 @@
|
||||
},
|
||||
"icu": {
|
||||
"baseline": "73.1",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"ideviceinstaller": {
|
||||
"baseline": "2023-07-21",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "b6ac20c2420a4f7118d5db326c8c599e50b2c5a4",
|
||||
"version": "73.1",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "deb5694d7965a264d6eb579df49aff4fe6362c24",
|
||||
"version": "73.1",
|
||||
|
Loading…
x
Reference in New Issue
Block a user