From c0dd8bd559cce4ec6264fc3170e3370a5bc1db8a Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Thu, 17 Mar 2022 00:22:42 +0100 Subject: [PATCH] [libiconv] remove doc files from share (#23510) * [libiconv] remove doc files from shared * version --- ports/libiconv/portfile.cmake | 19 ++++++++++--------- ports/libiconv/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libiconv.json | 5 +++++ 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index 9d8ff25aa0..ee3d63c50a 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -1,7 +1,7 @@ if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_ANDROID) 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) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/iconv") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/iconv") return() endif() @@ -26,7 +26,7 @@ if (NOT VCPKG_TARGET_IS_ANDROID) list(APPEND OPTIONS --enable-relocatable) endif() -vcpkg_configure_make(SOURCE_PATH ${SOURCE_PATH} +vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}" DETERMINE_BUILD_TRIPLET USE_WRAPPERS OPTIONS @@ -38,12 +38,13 @@ vcpkg_configure_make(SOURCE_PATH ${SOURCE_PATH} vcpkg_install_make() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin) +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin") -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/iconv) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/iconv") -file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}") # share contains unneeded doc files + +file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libiconv/vcpkg.json b/ports/libiconv/vcpkg.json index 2cafb02183..bda238d682 100644 --- a/ports/libiconv/vcpkg.json +++ b/ports/libiconv/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libiconv", "version": "1.16", - "port-version": 11, + "port-version": 12, "description": "GNU Unicode text conversion", "homepage": "https://www.gnu.org/software/libiconv/" } diff --git a/versions/baseline.json b/versions/baseline.json index 9ffef29514..8cbea4656e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3618,7 +3618,7 @@ }, "libiconv": { "baseline": "1.16", - "port-version": 11 + "port-version": 12 }, "libics": { "baseline": "1.6.5", diff --git a/versions/l-/libiconv.json b/versions/l-/libiconv.json index 9423b2719d..4ea73baa6a 100644 --- a/versions/l-/libiconv.json +++ b/versions/l-/libiconv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3942643a4d682982e61b60611394e4315dfc42a1", + "version": "1.16", + "port-version": 12 + }, { "git-tree": "f82980bff6c23bcccd043300679ebf8afa3e0a22", "version": "1.16",