From 261f5b1fcc106428df91d2f44f2bec9e50e11868 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Wed, 8 Feb 2023 03:01:58 +0400 Subject: [PATCH] Fix https://github.com/microsoft/vcpkg/issues/29322 (#29329) --- ports/icu/portfile.cmake | 2 +- ports/icu/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/icu.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index 4df1b25015..a3f8f97da8 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -158,7 +158,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() # Install executables from /tools/icu/sbin to /tools/icu/bin on unix (/bin because icu require this for cross compiling) -if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) +if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX AND "tools" IN_LIST FEATURES) vcpkg_copy_tools( TOOL_NAMES icupkg gennorm2 gencmn genccode gensprep SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools/icu/sbin" diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json index 160ee6d8b7..ebfe060b1a 100644 --- a/ports/icu/vcpkg.json +++ b/ports/icu/vcpkg.json @@ -1,7 +1,7 @@ { "name": "icu", "version": "72.1", - "port-version": 1, + "port-version": 2, "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 index 1973e99369..4b157a6f2b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3046,7 +3046,7 @@ }, "icu": { "baseline": "72.1", - "port-version": 1 + "port-version": 2 }, "ideviceinstaller": { "baseline": "1.1.2.23", diff --git a/versions/i-/icu.json b/versions/i-/icu.json index 5761efb4f4..fd1a92111a 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c06697d7c811e568d2e520db13e41fe656bb5468", + "version": "72.1", + "port-version": 2 + }, { "git-tree": "2a4109603660116f3cb7477c234d3f0275124738", "version": "72.1",