From 69ebe0cdad699fa1a4ba79effd6b91b0ca2426ad Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Wed, 20 May 2026 13:32:29 -0700 Subject: [PATCH] [rdma-core,suitesparce-paru,whisper-cpp] Acquire host pkg-config to find BLAS on arm64-linux CI (#51882) --- ports/rdma-core/portfile.cmake | 3 + ports/rdma-core/vcpkg.json | 2 +- ports/suitesparse-paru/portfile.cmake | 4 + ports/suitesparse-paru/vcpkg.json | 1 + ports/whisper-cpp/portfile.cmake | 74 ++++++++++--------- ports/whisper-cpp/vcpkg.json | 1 + .../test_ports/vcpkg-ci-ggml/portfile.cmake | 6 ++ versions/baseline.json | 6 +- versions/r-/rdma-core.json | 5 ++ versions/s-/suitesparse-paru.json | 5 ++ versions/w-/whisper-cpp.json | 5 ++ 11 files changed, 73 insertions(+), 39 deletions(-) diff --git a/ports/rdma-core/portfile.cmake b/ports/rdma-core/portfile.cmake index 2446365635..62c0bf4c47 100644 --- a/ports/rdma-core/portfile.cmake +++ b/ports/rdma-core/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) vcpkg_get_vcpkg_installed_python(PYTHON3) +vcpkg_find_acquire_program(PKGCONFIG) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" @@ -33,7 +34,9 @@ vcpkg_cmake_configure( -DVCPKG_LOCK_FIND_PACKAGE_pandoc=OFF -DVCPKG_LOCK_FIND_PACKAGE_rst2man=OFF -DPython_EXECUTABLE=${PYTHON3} + -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} MAYBE_UNUSED_VARIABLES + PKG_CONFIG_EXECUTABLE VCPKG_LOCK_FIND_PACKAGE_PythonLibs VCPKG_LOCK_FIND_PACKAGE_cython VCPKG_LOCK_FIND_PACKAGE_pandoc diff --git a/ports/rdma-core/vcpkg.json b/ports/rdma-core/vcpkg.json index b5890763cc..de0ffc55ae 100644 --- a/ports/rdma-core/vcpkg.json +++ b/ports/rdma-core/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rdma-core", "version": "62.0", - "port-version": 1, + "port-version": 2, "description": "The userspace components for the Linux Kernel's drivers/infiniband subsystem.", "homepage": "https://github.com/linux-rdma/rdma-core", "license": "(GPL-2.0-only OR Linux-OpenIB) AND (GPL-2.0-only OR BSD-3-Clause) AND (GPL-2.0-only OR BSD-2-Clause) AND CC0-1.0 AND MIT", diff --git a/ports/suitesparse-paru/portfile.cmake b/ports/suitesparse-paru/portfile.cmake index 979b610069..b0f46aa00b 100644 --- a/ports/suitesparse-paru/portfile.cmake +++ b/ports/suitesparse-paru/portfile.cmake @@ -15,6 +15,7 @@ configure_file( ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) +vcpkg_find_acquire_program(PKGCONFIG) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -26,11 +27,14 @@ vcpkg_cmake_configure( DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} -DSUITESPARSE_USE_CUDA=OFF -DSUITESPARSE_USE_STRICT=ON -DSUITESPARSE_USE_FORTRAN=OFF -DSUITESPARSE_DEMOS=OFF ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + PKG_CONFIG_EXECUTABLE ) vcpkg_cmake_install() diff --git a/ports/suitesparse-paru/vcpkg.json b/ports/suitesparse-paru/vcpkg.json index 73071088da..572489d484 100644 --- a/ports/suitesparse-paru/vcpkg.json +++ b/ports/suitesparse-paru/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Use scripts/update_suitesparse.py to update all SuiteSparse ports", "name": "suitesparse-paru", "version-semver": "1.1.0", + "port-version": 1, "description": "ParU: Routines for solving sparse linear system via parallel multifrontal LU factorization algorithms in SuiteSparse", "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", "license": "GPL-3.0-or-later", diff --git a/ports/whisper-cpp/portfile.cmake b/ports/whisper-cpp/portfile.cmake index d3ce1e22ce..dfe488dd55 100644 --- a/ports/whisper-cpp/portfile.cmake +++ b/ports/whisper-cpp/portfile.cmake @@ -1,35 +1,39 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ggml-org/whisper.cpp - REF "v${VERSION}" - SHA512 3b41035f9aaad31f0360b2d54d01c9c238628dec7b24a2a012afa6c5f82be998e002c8d3a98d6d4187198ac1fba6dea894b2e9307e2aa07cd5f28d8da17b27be - HEAD_REF master - PATCHES - cmake-config.diff - pkgconfig.diff -) -file(REMOVE_RECURSE "${SOURCE_PATH}/ggml") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - DISABLE_PARALLEL_CONFIGURE # updating bindings/javascript/package.json - OPTIONS - -DWHISPER_ALL_WARNINGS=OFF - -DWHISPER_BUILD_EXAMPLES=OFF - -DWHISPER_BUILD_SERVER=OFF - -DWHISPER_BUILD_TESTS=OFF - -DWHISPER_CCACHE=OFF - -DWHISPER_USE_SYSTEM_GGML=ON -) - -vcpkg_cmake_install() -vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/whisper") -vcpkg_fixup_pkgconfig() - -file(INSTALL "${SOURCE_PATH}/models/convert-pt-to-ggml.py" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ggml-org/whisper.cpp + REF "v${VERSION}" + SHA512 3b41035f9aaad31f0360b2d54d01c9c238628dec7b24a2a012afa6c5f82be998e002c8d3a98d6d4187198ac1fba6dea894b2e9307e2aa07cd5f28d8da17b27be + HEAD_REF master + PATCHES + cmake-config.diff + pkgconfig.diff +) +file(REMOVE_RECURSE "${SOURCE_PATH}/ggml") +vcpkg_find_acquire_program(PKGCONFIG) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE # updating bindings/javascript/package.json + OPTIONS + -DWHISPER_ALL_WARNINGS=OFF + -DWHISPER_BUILD_EXAMPLES=OFF + -DWHISPER_BUILD_SERVER=OFF + -DWHISPER_BUILD_TESTS=OFF + -DWHISPER_CCACHE=OFF + -DWHISPER_USE_SYSTEM_GGML=ON + -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} + MAYBE_UNUSED_VARIABLES + PKG_CONFIG_EXECUTABLE +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/whisper") +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/models/convert-pt-to-ggml.py" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/whisper-cpp/vcpkg.json b/ports/whisper-cpp/vcpkg.json index 22898688ab..c62bb68268 100644 --- a/ports/whisper-cpp/vcpkg.json +++ b/ports/whisper-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "whisper-cpp", "version": "1.8.4", + "port-version": 1, "description": "Port of OpenAI's Whisper model in C/C++", "homepage": "https://github.com/ggml-org/whisper.cpp", "license": "MIT", diff --git a/scripts/test_ports/vcpkg-ci-ggml/portfile.cmake b/scripts/test_ports/vcpkg-ci-ggml/portfile.cmake index 7a16fdb76c..c6ab1ab1c5 100644 --- a/scripts/test_ports/vcpkg-ci-ggml/portfile.cmake +++ b/scripts/test_ports/vcpkg-ci-ggml/portfile.cmake @@ -8,7 +8,13 @@ vcpkg_from_github( HEAD_REF master ) +vcpkg_find_acquire_program(PKGCONFIG) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/examples/test-cmake" + OPTIONS + -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} + MAYBE_UNUSED_VARIABLES + PKG_CONFIG_EXECUTABLE ) vcpkg_cmake_build() diff --git a/versions/baseline.json b/versions/baseline.json index e31886b486..3e99e82146 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8654,7 +8654,7 @@ }, "rdma-core": { "baseline": "62.0", - "port-version": 1 + "port-version": 2 }, "re2": { "baseline": "2025-11-05", @@ -9818,7 +9818,7 @@ }, "suitesparse-paru": { "baseline": "1.1.0", - "port-version": 0 + "port-version": 1 }, "suitesparse-rbio": { "baseline": "4.3.5", @@ -10826,7 +10826,7 @@ }, "whisper-cpp": { "baseline": "1.8.4", - "port-version": 0 + "port-version": 1 }, "wiiuse": { "baseline": "0.15.7", diff --git a/versions/r-/rdma-core.json b/versions/r-/rdma-core.json index 97711dcfc0..f084d2f0b9 100644 --- a/versions/r-/rdma-core.json +++ b/versions/r-/rdma-core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "171ca92bc9ffd3cea0062842d6b53786504ab8d9", + "version": "62.0", + "port-version": 2 + }, { "git-tree": "54af715001197fdaa1dcf76571ff083d68863e0b", "version": "62.0", diff --git a/versions/s-/suitesparse-paru.json b/versions/s-/suitesparse-paru.json index 78717cb66c..afd214c326 100644 --- a/versions/s-/suitesparse-paru.json +++ b/versions/s-/suitesparse-paru.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b1edcd1928a3c260e168bad53547f456f37ddba", + "version-semver": "1.1.0", + "port-version": 1 + }, { "git-tree": "4c4d094d5f6bc05c1203c98e9e9a4d4b1c84d6e8", "version-semver": "1.1.0", diff --git a/versions/w-/whisper-cpp.json b/versions/w-/whisper-cpp.json index e14ae71ffc..2ce6b21b49 100644 --- a/versions/w-/whisper-cpp.json +++ b/versions/w-/whisper-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "45e8b8f0f1292abbed112697fabab56529974233", + "version": "1.8.4", + "port-version": 1 + }, { "git-tree": "8be2835e7e3886aac1e8c2203c5b99c3a33c0cf7", "version": "1.8.4",