From e5c3485593f11e1bf0fca10346ea191040ad8789 Mon Sep 17 00:00:00 2001
From: "Lucius Q. User" <31438459+Lucius-Q-User@users.noreply.github.com>
Date: Wed, 23 Jun 2021 19:59:11 +0300
Subject: [PATCH] [icu] Fix x86-osx -> arm64-osx cross-compilation

---
 ports/icu/portfile.cmake | 9 +++++----
 ports/icu/vcpkg.json     | 2 +-
 versions/baseline.json   | 2 +-
 versions/i-/icu.json     | 5 +++++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake
index 386982cd6d95dd..64ca15b9fc327b 100644
--- a/ports/icu/portfile.cmake
+++ b/ports/icu/portfile.cmake
@@ -10,7 +10,7 @@ vcpkg_download_distfile(
     ARCHIVE
     URLS "https://github.com/unicode-org/icu/releases/download/release-${VERSION3}/icu4c-${VERSION2}-src.tgz"
     FILENAME "icu4c-${VERSION2}-src.tgz"
-    SHA512 d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7 
+    SHA512 d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7
 )
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -53,6 +53,7 @@ vcpkg_configure_make(
     OPTIONS ${CONFIGURE_OPTIONS}
     OPTIONS_RELEASE ${CONFIGURE_OPTIONS_RELEASE}
     OPTIONS_DEBUG ${CONFIGURE_OPTIONS_DEBUG}
+    DETERMINE_BUILD_TRIPLET
 )
 
 if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release"))
@@ -76,7 +77,7 @@ if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND (NOT DEF
     )
 
     message(STATUS "setting rpath prefix for macOS dynamic libraries")
-    
+
     # add ID_PREFIX to libicudata libicui18n libicuio libicutu libicuuc
     foreach(LIB_NAME libicudata libicui18n libicuio libicutu libicuuc)
         vcpkg_execute_build_process(
@@ -86,7 +87,7 @@ if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND (NOT DEF
             LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}"
         )
     endforeach()
-    
+
     # add ID_PREFIX to libicui18n libicuio libicutu dependencies
     foreach(LIB_NAME libicui18n libicuio)
         vcpkg_execute_build_process(
@@ -131,7 +132,7 @@ if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND (NOT DEF
         WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}"
         LOGNAME "make-install-${RELEASE_TRIPLET}")
     message(STATUS "Package ${RELEASE_TRIPLET} done")
-    
+
 else()
     vcpkg_install_make()
 endif()
diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json
index 88e82a08dd3304..3396b0f9c44cc0 100644
--- a/ports/icu/vcpkg.json
+++ b/ports/icu/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "icu",
   "version": "69.1",
-  "port-version": 10,
+  "port-version": 11,
   "description": "Mature and widely used Unicode and localization library.",
   "homepage": "http://icu-project.org/apiref/icu4c/",
   "supports": "!uwp",
diff --git a/versions/baseline.json b/versions/baseline.json
index aa632f7148d93c..8af9571ebbe49f 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2542,7 +2542,7 @@
     },
     "icu": {
       "baseline": "69.1",
-      "port-version": 10
+      "port-version": 11
     },
     "ideviceinstaller": {
       "baseline": "1.1.2.23-1",
diff --git a/versions/i-/icu.json b/versions/i-/icu.json
index 7f106d54b9219f..41fe2dbb8287c7 100644
--- a/versions/i-/icu.json
+++ b/versions/i-/icu.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "46d639d2e138f9ee3362fd8023f64463ae4e6afa",
+      "version": "69.1",
+      "port-version": 11
+    },
     {
       "git-tree": "07e8fca3896a13ac7b4196e104015174429a6c74",
       "version": "69.1",