diff --git a/ports/icu/CONTROL b/ports/icu/CONTROL index 96c578b09982dc..2e1bc694d66dc3 100644 --- a/ports/icu/CONTROL +++ b/ports/icu/CONTROL @@ -1,6 +1,6 @@ Source: icu Version: 67.1 -Port-Version: 8 +Port-Version: 9 Homepage: http://icu-project.org/apiref/icu4c/ Description: Mature and widely used Unicode and localization library. Supports: !(arm|uwp) diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index 60fb602288837c..60e07d9521280c 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -56,6 +56,12 @@ if(NOT VCPKG_TARGET_IS_WINDOWS) "${SOURCE_PATH}/source/runConfigureICU Linux ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_RELEASE}" WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}" LOGNAME "configure-${RELEASE_TRIPLET}") + if(VCPKG_TARGET_IS_OSX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + file(READ "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/icudefs.mk" FILE_CONTENTS) + string(REPLACE "CC = clang" "CC = clang -arch x86_64" FILE_CONTENTS ${FILE_CONTENTS}) + string(REPLACE "CXX = clang++" "CXX = clang++ -arch x86_64" FILE_CONTENTS ${FILE_CONTENTS}) + file(WRITE "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/icudefs.mk" ${FILE_CONTENTS}) + endif() message(STATUS "Configuring ${RELEASE_TRIPLET} done") endif() @@ -71,6 +77,12 @@ if(NOT VCPKG_TARGET_IS_WINDOWS) "${SOURCE_PATH}/source/runConfigureICU Linux ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEBUG}" WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}" LOGNAME "configure-${DEBUG_TRIPLET}") + if(VCPKG_TARGET_IS_OSX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + file(READ "${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}/icudefs.mk" FILE_CONTENTS) + string(REPLACE "CC = clang" "CC = clang -arch x86_64" FILE_CONTENTS ${FILE_CONTENTS}) + string(REPLACE "CXX = clang++" "CXX = clang++ -arch x86_64" FILE_CONTENTS ${FILE_CONTENTS}) + file(WRITE "${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}/icudefs.mk" ${FILE_CONTENTS}) + endif() message(STATUS "Configuring ${DEBUG_TRIPLET} done") endif() diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 257db0c3d7a2dd..bb69cf2e06e0a5 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -442,8 +442,6 @@ hiredis:x64-uwp=fail hpx:x64-windows-static=fail hpx:x64-linux=fail libhsplasma:x64-windows-static=fail -icu:arm-uwp=fail -icu:x64-uwp=fail ideviceinstaller:x64-windows-static-md=fail idevicerestore:x64-linux=fail idevicerestore:x64-osx=fail diff --git a/versions/baseline.json b/versions/baseline.json index ffafcb65528764..4704c1c93bd6e8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2450,7 +2450,7 @@ }, "icu": { "baseline": "67.1", - "port-version": 8 + "port-version": 9 }, "ideviceinstaller": { "baseline": "1.1.2.23-1", diff --git a/versions/i-/icu.json b/versions/i-/icu.json index d91bfed139c7d8..d82abc3baa5fb4 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4fc3c9f90e2b00da9e71d4dfa08fa58ec3edf12", + "version-string": "67.1", + "port-version": 9 + }, { "git-tree": "db2977707d68a8c04e0960b0965722f8e5bfda20", "version-string": "67.1",