From 4f746bc66438fce2b900c3ba6094a483b871b045 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 1 Nov 2024 08:59:53 +0100 Subject: [PATCH] [libcap] Update to 2.71 (#41852) --- ports/libcap/configure | 1 + ports/libcap/portfile.cmake | 9 ++++++++- ports/libcap/vcpkg.json | 6 +++++- versions/baseline.json | 2 +- versions/l-/libcap.json | 5 +++++ 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/ports/libcap/configure b/ports/libcap/configure index fc3874839b..a4749cd8d3 100755 --- a/ports/libcap/configure +++ b/ports/libcap/configure @@ -21,6 +21,7 @@ BUILD_OPTIONS = \ "AR=$AR" \ "BUILD_CC=$CC" \ "CC=$CC" \ + "OBJCOPY=$OBJCOPY" \ "RANLIB=$RANLIB" \ "lib=lib" \ "prefix=$prefix" diff --git a/ports/libcap/portfile.cmake b/ports/libcap/portfile.cmake index fa983a043d..1d156f6428 100644 --- a/ports/libcap/portfile.cmake +++ b/ports/libcap/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_download_distfile(ARCHIVE URLS "https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-${VERSION}.tar.xz" "https://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-${VERSION}.tar.xz" FILENAME "libcap-${VERSION}.tar.xz" - SHA512 4e0bf0efeccb654c409afe9727b2b53c1d4da8190d7a0a9848fc52550ff3e13502add3eacde04a68a5b7bec09e91df487f64c5746ba987f873236a9e53b3d4e8 + SHA512 59bb6781d96776595ad3df890f4e5188380634eabbb6128f3a5307946b01cf3bd19dee8a29d3e501de1d9e1c6ed0092c4cd5adc91da227a1260c1f4356cc0bf3 ) vcpkg_extract_source_archive(SOURCE_PATH @@ -18,6 +18,13 @@ if(VCPKG_CROSSCOMPILING) file(TOUCH "${SOURCE_PATH}/libcap/cap_names.h") endif() +block(SCOPE_FOR VARIABLES) + set(VCPKG_CMAKE_CONFIGURE_OPTIONS "-DVCPKG_VARS_TO_CHECK=CMAKE_OBJCOPY") + vcpkg_cmake_get_vars(cmake_vars_file) + include("${cmake_vars_file}") + set(ENV{OBJCOPY} "${VCPKG_DETECTED_CMAKE_OBJCOPY}") +endblock() + vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" COPY_SOURCE diff --git a/ports/libcap/vcpkg.json b/ports/libcap/vcpkg.json index 3ca2c6cdd0..842efa03ba 100644 --- a/ports/libcap/vcpkg.json +++ b/ports/libcap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libcap", - "version": "2.70", + "version": "2.71", "description": "A library for getting and setting POSIX.1e (formerly POSIX 6) draft 15 capabilities.", "homepage": "https://sites.google.com/site/fullycapable/", "license": "BSD-3-Clause OR GPL-2.0-only", @@ -9,6 +9,10 @@ { "name": "libcap", "host": true + }, + { + "name": "vcpkg-cmake-get-vars", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index c53d7da663..5faac748c3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4337,7 +4337,7 @@ "port-version": 4 }, "libcap": { - "baseline": "2.70", + "baseline": "2.71", "port-version": 0 }, "libcbor": { diff --git a/versions/l-/libcap.json b/versions/l-/libcap.json index a318e90937..fcaffbf261 100644 --- a/versions/l-/libcap.json +++ b/versions/l-/libcap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "624965e04fa91928fc26f8a061527d30ed58bf98", + "version": "2.71", + "port-version": 0 + }, { "git-tree": "c7a0cc03982a375c59205880aea11305d37464c0", "version": "2.70",