Skip to content

[icu] remove setting triplet #19620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 2 commits into from
Sep 1, 2021
Merged

[icu] remove setting triplet #19620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd1a613
[icu] remove setting triplet
autoantwort Aug 17, 2021
78e5096
add version files
autoantwort Aug 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions ports/icu/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion ports/icu/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2582,7 +2582,7 @@
},
"icu": {
"baseline": "69.1",
"port-version": 11
"port-version": 12
},
"ideviceinstaller": {
"baseline": "1.1.2.23-1",
Expand Down
5 changes: 5 additions & 0 deletions versions/i-/icu.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "02bcc079d00e16237aa0d1af449d7663581a1525",
"version": "69.1",
"port-version": 12
},
{
"git-tree": "46d639d2e138f9ee3362fd8023f64463ae4e6afa",
"version": "69.1",
Expand Down