From 5d0bbe89ea4d13ae96ebf41b8d3345f00d8bf012 Mon Sep 17 00:00:00 2001 From: WangWeiLin-MV <156736127+WangWeiLin-MV@users.noreply.github.com> Date: Wed, 4 Sep 2024 02:16:05 +0800 Subject: [PATCH] [sassc] Exclude dependency getopt (#40757) --- ports/sassc/portfile.cmake | 17 ++++++++--------- ports/sassc/vcpkg.json | 6 +++++- versions/baseline.json | 2 +- versions/s-/sassc.json | 5 +++++ 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/ports/sassc/portfile.cmake b/ports/sassc/portfile.cmake index 45982e835b..e703366302 100644 --- a/ports/sassc/portfile.cmake +++ b/ports/sassc/portfile.cmake @@ -1,7 +1,9 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sass/sassc - REF 3.6.2 + REF "${VERSION}" SHA512 fff3995ce8608bdaed5f4f1352ae4f1f882de58663b932c598d6168df421e4dbf907ec0f8caebb1e56490a71ca11105726f291b475816dd53e705bc53121969f HEAD_REF master PATCHES remove_compiler_flags.patch @@ -9,26 +11,23 @@ vcpkg_from_github( find_library(LIBSASS_DEBUG sass PATHS "${CURRENT_INSTALLED_DIR}/debug/lib/" NO_DEFAULT_PATH) find_library(LIBSASS_RELEASE sass PATHS "${CURRENT_INSTALLED_DIR}/lib/" NO_DEFAULT_PATH) -if(VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(ENV{LIBS} "$ENV{LIBS} -lgetopt") endif() vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG OPTIONS - --with-libsass-include='${CURRENT_INSTALLED_DIR}/include' + "--with-libsass-include='${CURRENT_INSTALLED_DIR}/include'" OPTIONS_DEBUG - --with-libsass-lib='${LIBSASS_DEBUG}' + "--with-libsass-lib='${LIBSASS_DEBUG}'" OPTIONS_RELEASE - --with-libsass-lib='${LIBSASS_RELEASE}' + "--with-libsass-lib='${LIBSASS_RELEASE}'" ) vcpkg_install_make(MAKEFILE GNUmakefile) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") - -set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) \ No newline at end of file diff --git a/ports/sassc/vcpkg.json b/ports/sassc/vcpkg.json index 84158ee4df..99a7023214 100644 --- a/ports/sassc/vcpkg.json +++ b/ports/sassc/vcpkg.json @@ -1,10 +1,14 @@ { "name": "sassc", "version": "3.6.2", + "port-version": 1, "description": "SassC is a wrapper around libsass (http://github.com/sass/libsass) used to generate a useful command-line application that can be installed and packaged for several operating systems.", "homepage": "https://github.com/sass/sassc", "dependencies": [ - "getopt", + { + "name": "getopt", + "platform": "windows & !mingw" + }, "libsass" ] } diff --git a/versions/baseline.json b/versions/baseline.json index f7e4025164..f4e44c76c8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8010,7 +8010,7 @@ }, "sassc": { "baseline": "3.6.2", - "port-version": 0 + "port-version": 1 }, "saucer": { "baseline": "2.3.0", diff --git a/versions/s-/sassc.json b/versions/s-/sassc.json index b72f7981a8..68e0e2d623 100644 --- a/versions/s-/sassc.json +++ b/versions/s-/sassc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "937f959ed298caa217edd7352d5743b073ff27f7", + "version": "3.6.2", + "port-version": 1 + }, { "git-tree": "ac068d38115fa4710289d76d3a02a1b6c2650785", "version": "3.6.2",