diff options
| author | autoantwort <41973254+autoantwort@users.noreply.github.com> | 2021-09-01 23:29:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-01 14:29:06 -0700 |
| commit | adc1caf8f9cac9c14e184d7e2dc9cebe7af7c02d (patch) | |
| tree | 6f6cfbc49954067bc44e964f5ab7ede9baf0b8c9 | |
| parent | 44fac549c4bbd7592eed8c1f2cf7435265257890 (diff) | |
| download | vcpkg-adc1caf8f9cac9c14e184d7e2dc9cebe7af7c02d.tar.gz vcpkg-adc1caf8f9cac9c14e184d7e2dc9cebe7af7c02d.zip | |
[icu] remove setting triplet (#19620)
* [icu] remove setting triplet
* add version files
| -rw-r--r-- | ports/icu/portfile.cmake | 9 | ||||
| -rw-r--r-- | ports/icu/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/i-/icu.json | 5 |
4 files changed, 7 insertions, 11 deletions
diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index 64ca15b9f..8533c384a 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -38,18 +38,9 @@ if(NOT "${TARGET_TRIPLET}" STREQUAL "${HOST_TRIPLET}") list(APPEND CONFIGURE_OPTIONS "--with-cross-build=${_VCPKG_INSTALLED_DIR}/${HOST_TRIPLET}/tools/${PORT}") endif() -if(VCPKG_TARGET_IS_WINDOWS) - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(BUILD_TRIPLET --host=x86_64-w64-mingw32) - else() - set(BUILD_TRIPLET --host=i686-w64-mingw32) - endif() -endif() - vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} PROJECT_SUBPATH source - BUILD_TRIPLET ${BUILD_TRIPLET} OPTIONS ${CONFIGURE_OPTIONS} OPTIONS_RELEASE ${CONFIGURE_OPTIONS_RELEASE} OPTIONS_DEBUG ${CONFIGURE_OPTIONS_DEBUG} diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json index 3396b0f9c..c4f6e3c4b 100644 --- a/ports/icu/vcpkg.json +++ b/ports/icu/vcpkg.json @@ -1,7 +1,7 @@ { "name": "icu", "version": "69.1", - "port-version": 11, + "port-version": 12, "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 58ff7af0a..99da61e30 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2586,7 +2586,7 @@ }, "icu": { "baseline": "69.1", - "port-version": 11 + "port-version": 12 }, "ideviceinstaller": { "baseline": "1.1.2.23-1", diff --git a/versions/i-/icu.json b/versions/i-/icu.json index 41fe2dbb8..cf7ef20da 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "02bcc079d00e16237aa0d1af449d7663581a1525", + "version": "69.1", + "port-version": 12 + }, + { "git-tree": "46d639d2e138f9ee3362fd8023f64463ae4e6afa", "version": "69.1", "port-version": 11 |