[numactl] Update, modernise (#44818)

This commit is contained in:
Kai Pastor 2025-04-05 09:17:13 +02:00 committed by GitHub
parent 5ae3abb26a
commit 386267fc96
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 38 additions and 57 deletions

View File

@ -0,0 +1,10 @@
diff --git a/numa.pc.in b/numa.pc.in
index cc04d50..78f319d 100644
--- a/numa.pc.in
+++ b/numa.pc.in
@@ -8,4 +8,4 @@ Description: NUMA policy library
Version: @VERSION@
Cflags: -I${includedir}
Libs: -L${libdir} -lnuma
-Libs.Private: @LIBS@
+Libs.private: @LIBS@

View File

@ -2,68 +2,27 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO numactl/numactl
REF "v${VERSION}"
SHA512 fc062e7fcfd90e3d26d0e3b144b4c4328b54874aef6ad0c91d7740e5989787a182037c5d409ce9271f0a6459d4d7e70f49cc5f701d93b64a15d3b7772accb9b4
SHA512 a9aa93bdc6333b620c10ff3573d6ff645ab54beece75e67be8cdddb27d062cc56cea34db342005a171877f85f05eb1d24e43f8466be907ba3b7c8b1f897cd954
HEAD_REF master
PATCHES
pkgconfig.diff
)
message(
"numactl currently requires the following libraries from the system package manager:
autoconf libtool
These can be installed on Ubuntu systems via sudo apt install autoconf libtool"
These can be installed on Ubuntu systems via
sudo apt install autoconf libtool"
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
set(SHARED_STATIC --enable-static --disable-shared)
else()
set(SHARED_STATIC --disable-static --enable-shared)
endif()
set(OPTIONS ${SHARED_STATIC})
vcpkg_execute_required_process(
COMMAND ${SOURCE_PATH}/autogen.sh
WORKING_DIRECTORY ${SOURCE_PATH}
LOGNAME setup-${TARGET_TRIPLET}
vcpkg_make_configure(
SOURCE_PATH "${SOURCE_PATH}"
AUTORECONF
)
file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
set(CFLAGS "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG} -fPIC -O0 -g -I${SOURCE_PATH}/include")
set(LDFLAGS "${VCPKG_LINKER_FLAGS}")
vcpkg_execute_required_process(
COMMAND ${SOURCE_PATH}/configure --prefix=${CURRENT_PACKAGES_DIR}/debug ${OPTIONS} --with-sysroot=${CURRENT_INSTALLED_DIR}/debug
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
LOGNAME configure-${TARGET_TRIPLET}-dbg
)
message(STATUS "Building ${TARGET_TRIPLET}-dbg")
vcpkg_execute_required_process(
COMMAND make -j install "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}"
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
LOGNAME install-${TARGET_TRIPLET}-dbg
)
file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
set(CFLAGS "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE} -fPIC -O3 -I${SOURCE_PATH}/include")
set(LDFLAGS "${VCPKG_LINKER_FLAGS}")
vcpkg_execute_required_process(
COMMAND ${SOURCE_PATH}/configure --prefix=${CURRENT_PACKAGES_DIR} ${OPTIONS} --with-sysroot=${CURRENT_INSTALLED_DIR}
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
LOGNAME configure-${TARGET_TRIPLET}-rel
)
message(STATUS "Building ${TARGET_TRIPLET}-rel")
vcpkg_execute_required_process(
COMMAND make -j install "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}"
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
LOGNAME install-${TARGET_TRIPLET}-rel
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()
vcpkg_make_install()
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
configure_file(${SOURCE_PATH}/README.md ${CURRENT_PACKAGES_DIR}/share/numactl/copyright COPYONLY)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/README.md" "${SOURCE_PATH}/LICENSE.LGPL2.1" "${SOURCE_PATH}/LICENSE.GPL2")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" ".*# License" "# License" REGEX)

View File

@ -1,7 +1,14 @@
{
"name": "numactl",
"version": "2.0.18",
"version": "2.0.19",
"description": "NUMA support for Linux",
"homepage": "https://github.com/numactl/numactl",
"supports": "linux"
"license": null,
"supports": "linux",
"dependencies": [
{
"name": "vcpkg-make",
"host": true
}
]
}

View File

@ -6597,7 +6597,7 @@
"port-version": 0
},
"numactl": {
"baseline": "2.0.18",
"baseline": "2.0.19",
"port-version": 0
},
"numcpp": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "32c1e5324db239f521bfea178d0dbb7139900e9c",
"version": "2.0.19",
"port-version": 0
},
{
"git-tree": "87e65b2becdf4301dc9cdb175f893fa0f2215f14",
"version": "2.0.18",