[icu] Let pkgdata use target toolchain settings [skip actions]

microsoft · Dec 24, 2023 · 06727eb · 06727eb
1 parent 07bc089
commit 06727eb
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 1 deletion.
diff --git a/ports/icu/msvc-pkgdata.patch b/ports/icu/msvc-pkgdata.patch
@@ -0,0 +1,16 @@
+diff --git a/source/tools/pkgdata/pkgdata.cpp b/source/tools/pkgdata/pkgdata.cpp
+index c2ac112..e3a0e09 100644
+--- a/source/tools/pkgdata/pkgdata.cpp
++++ b/source/tools/pkgdata/pkgdata.cpp
+@@ -784,7 +784,11 @@ static int32_t pkg_executeOptions(UPKGOptions *o) {
+                     pkg_destroyOptMatchArch(optMatchArch);
+ #if U_PLATFORM_IS_LINUX_BASED
+                     result = pkg_generateLibraryFile(targetDir, mode, gencFilePath);
++#elif defined(WINDOWS_WITH_MSVC) && USING_CYGWIN
++                    # Use vcpkg toolchain settings when building with MSVC on Windows in MSYS2
++                    result = pkg_generateLibraryFile(targetDir, mode, gencFilePath);
+ #elif defined(WINDOWS_WITH_MSVC)
++                    # Use pristine hard-coded settings
+                     result = pkg_createWindowsDLL(mode, gencFilePath, o);
+ #endif
+ #elif defined(BUILD_DATA_WITHOUT_ASSEMBLY)
diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake
@@ -21,6 +21,7 @@ vcpkg_extract_source_archive(SOURCE_PATH
         fix-win-build.patch
         vcpkg-cross-data.patch
         darwin-rpath.patch
+        msvc-pkgdata.patch
 )
 
 vcpkg_find_acquire_program(PYTHON3)

diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "icu",
   "version": "74.1",
+  "port-version": 1,
   "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
@@ -3386,7 +3386,7 @@
     },
     "icu": {
       "baseline": "74.1",
-      "port-version": 0
+      "port-version": 1
     },
     "ideviceinstaller": {
       "baseline": "2023-07-21",

diff --git a/versions/i-/icu.json b/versions/i-/icu.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6c8610a0d36f44d625f0e507fdccf61522d84bab",
+      "version": "74.1",
+      "port-version": 1
+    },
     {
       "git-tree": "0a6f5ea29d6445c8af30f19952c62cc5dd5e2a5b",
       "version": "74.1",