[icu] Add a way to set --with-data-packaging value during configuration

microsoft · Jan 19, 2025 · 0d97645 · 0d97645
1 parent cf035d9
commit 0d97645
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake
@@ -79,6 +79,13 @@ elseif(VCPKG_CROSSCOMPILING)
     list(APPEND CONFIGURE_OPTIONS "--with-cross-build=${_VCPKG_TOOL_PATH}")
 endif()
 
+# The package osg can be configured to use different data packaging options via a custom triplet file:
+# Possible values are library, static, auto, files and archive
+# https://unicode-org.github.io/icu/userguide/icu_data/#building-and-linking-against-icu-data
+if(NOT DEFINED icu_data_packaging)
+    set(icu_data_packaging "auto")
+endif()
+
 vcpkg_configure_make(
     SOURCE_PATH "${SOURCE_PATH}"
     PROJECT_SUBPATH source
@@ -87,6 +94,7 @@ vcpkg_configure_make(
     ADDITIONAL_MSYS_PACKAGES autoconf-archive
     OPTIONS
         ${CONFIGURE_OPTIONS}
+        --with-data-packaging=${icu_data_packaging}
         --disable-samples
         --disable-tests
         --disable-layoutex

diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "icu",
   "version": "74.2",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Mature and widely used Unicode and localization library.",
   "homepage": "https://icu.unicode.org/home",
   "license": "ICU",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -3558,7 +3558,7 @@
     },
     "icu": {
       "baseline": "74.2",
-      "port-version": 4
+      "port-version": 5
     },
     "ideviceinstaller": {
       "baseline": "2023-07-21",

diff --git a/versions/i-/icu.json b/versions/i-/icu.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f5efa3dd2ea58df2064249a88d5cbf0d6ec1418d",
+      "version": "74.2",
+      "port-version": 5
+    },
     {
       "git-tree": "291bbc492b8f73dea0dbd12051e9b12b21aef900",
       "version": "74.2",