From 5517637cbe0b92512c4260c6ba9e83f35ec64d2a Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Tue, 9 Jan 2024 04:15:52 +0700 Subject: [PATCH] [libiconv] Build for ios (#36035) --- ports/libiconv/portfile.cmake | 2 +- ports/libiconv/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libiconv.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index b834b2aadf..134de5683a 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -1,4 +1,4 @@ -if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_ANDROID) +if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_ANDROID AND NOT VCPKG_TARGET_IS_IOS) set(VCPKG_POLICY_EMPTY_PACKAGE enabled) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/iconv") file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/iconv") diff --git a/ports/libiconv/vcpkg.json b/ports/libiconv/vcpkg.json index 0ed97096b0..67225b186f 100644 --- a/ports/libiconv/vcpkg.json +++ b/ports/libiconv/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libiconv", "version": "1.17", - "port-version": 1, + "port-version": 2, "description": "GNU Unicode text conversion", "homepage": "https://www.gnu.org/software/libiconv/", "license": null diff --git a/versions/baseline.json b/versions/baseline.json index f937989191..7aa62358c8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4406,7 +4406,7 @@ }, "libiconv": { "baseline": "1.17", - "port-version": 1 + "port-version": 2 }, "libics": { "baseline": "1.6.6", diff --git a/versions/l-/libiconv.json b/versions/l-/libiconv.json index bd0520181d..142978f115 100644 --- a/versions/l-/libiconv.json +++ b/versions/l-/libiconv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6103c3aaaf279f20df4c758fd25d5954c8582cbd", + "version": "1.17", + "port-version": 2 + }, { "git-tree": "4226589d5d658f4d96df83f8539de54dc57a5996", "version": "1.17",