[ggml,llama-cpp,whisper-cpp] Fix exported config, add test ports (#45745)

Author: dg0yt

ports/ggml/pkgconfig.diff

@@ -0,0 +1,217 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 90e274cc..b20534f9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -294,7 +294,7 @@ if (GGML_STANDALONE)
+         @ONLY)
+ 
+     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ggml.pc
+-        DESTINATION share/pkgconfig)
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ endif()
+ 
+ #
+@@ -335,6 +335,7 @@ set(variable_set_statements
+ set(GGML_SHARED_LIB ${BUILD_SHARED_LIBS})
+ 
+ get_cmake_property(all_variables VARIABLES)
++list(FILTER all_variables EXCLUDE REGEX "^GGML_PKGCONFIG")
+ foreach(variable_name IN LISTS all_variables)
+     if(variable_name MATCHES "^GGML_")
+         string(REPLACE ";" "\\;"
+diff --git a/ggml.pc.in b/ggml.pc.in
+index 9be62dc3..a37b0478 100644
+--- a/ggml.pc.in
++++ b/ggml.pc.in
+@@ -6,5 +6,7 @@ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+ Name: ggml
+ Description: The GGML Tensor Library for Machine Learning
+ Version: 0.0.0
+-Cflags: -I${includedir}
+-Libs: -L${libdir} -lggml
++Cflags: -I${includedir} @GGML_PKGCONFIG_CFLAGS@
++Libs: -L${libdir} -lggml @GGML_PKGCONFIG_LIBS_BACKEND@ -lggml-base
++Libs.private: @GGML_PKGCONFIG_LIBS_PRIVATE@
++Requires.private: @GGML_PKGCONFIG_REQUIRES_PRIVATE@
+\ No newline at end of file
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 2b5b8169..1a4475b5 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -183,6 +183,10 @@ endif()
+ 
+ # ggml
+ 
++set(GGML_PKGCONFIG_CFLAGS "")
++set(GGML_PKGCONFIG_LIBS_BACKEND "")
++set(GGML_PKGCONFIG_LIBS_PRIVATE "")
++
+ if (GGML_BACKEND_DL AND NOT BUILD_SHARED_LIBS)
+     message(FATAL_ERROR "GGML_BACKEND_DL requires BUILD_SHARED_LIBS")
+ endif()
+@@ -225,6 +229,7 @@ target_link_libraries(ggml PUBLIC ggml-base)
+ 
+ if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+     target_link_libraries(ggml PRIVATE dl)
++    string(APPEND GGML_PKGCONFIG_LIBS_PRIVATE " -ldl")
+ endif()
+ 
+ function(ggml_add_backend_library backend)
+@@ -269,12 +274,20 @@ function(ggml_add_backend backend)
+     string(TOUPPER "GGML_${backend}" backend_id)
+     if (${backend_id})
+         string(TOLOWER "ggml-${backend}" backend_target)
++        if (NOT GGML_BACKEND_DL)
++            # Mirrors ggml_add_backend_library but avoids cmake scoping 
++            set(GGML_PKGCONFIG_LIBS_BACKEND "${GGML_PKGCONFIG_LIBS_BACKEND} -l${backend_target}")
++        endif()
+         add_subdirectory(${backend_target})
+         message(STATUS "Including ${backend} backend")
+         if (NOT GGML_BACKEND_DL)
+             string(TOUPPER "GGML_USE_${backend}" backend_use)
+             target_compile_definitions(ggml PUBLIC ${backend_use})
++            set(GGML_PKGCONFIG_CFLAGS "${GGML_PKGCONFIG_CFLAGS} -D${backend_use}" PARENT_SCOPE)
+         endif()
++        set(GGML_PKGCONFIG_LIBS_BACKEND "${GGML_PKGCONFIG_LIBS_BACKEND}" PARENT_SCOPE)
++        set(GGML_PKGCONFIG_LIBS_PRIVATE "${GGML_PKGCONFIG_LIBS_PRIVATE}" PARENT_SCOPE)
++        set(GGML_PKGCONFIG_REQUIRES_PRIVATE "${GGML_PKGCONFIG_REQUIRES_PRIVATE}" PARENT_SCOPE)
+     endif()
+ endfunction()
+ 
+@@ -396,11 +409,15 @@ find_library(MATH_LIBRARY m)
+ if (MATH_LIBRARY)
+     if (NOT WIN32 OR NOT DEFINED ENV{ONEAPI_ROOT})
+         target_link_libraries(ggml-base PRIVATE m)
++        string(APPEND GGML_PKGCONFIG_LIBS_PRIVATE " -lm")
+     endif()
+ endif()
+ 
+ if (CMAKE_SYSTEM_NAME MATCHES "Android")
+     target_link_libraries(ggml-base PRIVATE dl)
++    if(NOT GGML_PKGCONFIG_LIBS_PRIVATE MATCHES " -ldl")
++        string(APPEND GGML_PKGCONFIG_LIBS_PRIVATE " -ldl")
++    endif()
+ endif()
+ 
+ if(CMAKE_SYSTEM_NAME MATCHES "visionOS")
+@@ -413,4 +430,10 @@ if (BUILD_SHARED_LIBS)
+         target_compile_definitions(${target} PRIVATE GGML_BUILD)
+         target_compile_definitions(${target} PUBLIC  GGML_SHARED)
+     endforeach()
++    string(APPEND GGML_PKGCONFIG_CFLAGS " -DGGML_SHARED -DGGML_BACKEND_SHARED")
+ endif()
++
++set(GGML_PKGCONFIG_CFLAGS "${GGML_PKGCONFIG_CFLAGS}" PARENT_SCOPE)
++set(GGML_PKGCONFIG_LIBS_BACKEND "${GGML_PKGCONFIG_LIBS_BACKEND}" PARENT_SCOPE)
++set(GGML_PKGCONFIG_LIBS_PRIVATE "${GGML_PKGCONFIG_LIBS_PRIVATE}" PARENT_SCOPE)
++set(GGML_PKGCONFIG_REQUIRES_PRIVATE "${GGML_PKGCONFIG_REQUIRES_PRIVATE}" PARENT_SCOPE)
+diff --git a/src/ggml-blas/CMakeLists.txt b/src/ggml-blas/CMakeLists.txt
+index 76064c3f..69415049 100644
+--- a/src/ggml-blas/CMakeLists.txt
++++ b/src/ggml-blas/CMakeLists.txt
+@@ -79,6 +79,7 @@ if (BLAS_FOUND)
+     endif()
+ 
+     target_link_libraries     (ggml-blas PRIVATE ${BLAS_LIBRARIES})
++    set(GGML_PKGCONFIG_REQUIRES_PRIVATE "${GGML_PKGCONFIG_REQUIRES_PRIVATE} cblas" PARENT_SCOPE)
+     target_include_directories(ggml-blas PRIVATE ${BLAS_INCLUDE_DIRS})
+ else()
+     message(FATAL_ERROR "BLAS not found, please refer to "
+diff --git a/src/ggml-cpu/CMakeLists.txt b/src/ggml-cpu/CMakeLists.txt
+index ce0a3e12..0eea5432 100644
+--- a/src/ggml-cpu/CMakeLists.txt
++++ b/src/ggml-cpu/CMakeLists.txt
+@@ -52,6 +52,9 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
+     target_compile_features(${GGML_CPU_NAME} PRIVATE c_std_11 cxx_std_17)
+     target_include_directories(${GGML_CPU_NAME} PRIVATE . ggml-cpu)
+ 
++    set(libs_private "")
++    set(pkgconfig_cflags "")
++
+     if (APPLE AND GGML_ACCELERATE)
+         find_library(ACCELERATE_FRAMEWORK Accelerate)
+         if (ACCELERATE_FRAMEWORK)
+@@ -62,6 +65,7 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
+             target_compile_definitions(${GGML_CPU_NAME} PRIVATE ACCELERATE_LAPACK_ILP64)
+ 
+             target_link_libraries(${GGML_CPU_NAME} PRIVATE ${ACCELERATE_FRAMEWORK})
++            string(APPEND libs_private " -framework Accelerate")
+         else()
+             message(WARNING "Accelerate framework not found")
+         endif()
+@@ -74,6 +78,18 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
+             target_compile_definitions(${GGML_CPU_NAME} PRIVATE GGML_USE_OPENMP)
+ 
+             target_link_libraries(${GGML_CPU_NAME} PRIVATE OpenMP::OpenMP_C OpenMP::OpenMP_CXX)
++            set(items "")
++            foreach(lib IN LISTS OpenMP_CXX_LIB_NAMES OpenMP_C_LIB_NAMES)
++                list(REMOVE_ITEM items " -l${lib}")
++                list(APPEND items " -l${lib}")
++            endforeach()
++            string(APPEND libs_private ${items})
++            set(items "")
++            foreach(flag IN LISTS OpenMP_CXX_FLAGS OpenMP_C_FLAGS)
++                list(REMOVE_ITEM items " ${flag}")
++                list(APPEND items " ${flag}")
++            endforeach()
++            string(APPEND pkgconfig_cflags ${items})
+         else()
+             set(GGML_OPENMP_ENABLED "OFF" CACHE INTERNAL "")
+             message(WARNING "OpenMP not found")
+@@ -96,8 +112,12 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
+         target_compile_definitions(${GGML_CPU_NAME} PRIVATE GGML_USE_CPU_HBM)
+ 
+         target_link_libraries(${GGML_CPU_NAME} PUBLIC memkind)
++        string(APPEND libs_private " -lmemkind")
+     endif()
+ 
++    set(GGML_PKGCONFIG_CFLAGS "${GGML_PKGCONFIG_CFLAGS}${pkgconfig_cflags}" PARENT_SCOPE)
++    set(GGML_PKGCONFIG_LIBS_PRIVATE "${GGML_PKGCONFIG_LIBS_PRIVATE}${libs_private}" PARENT_SCOPE)
++
+     if (GGML_SYSTEM_ARCH STREQUAL "ARM")
+         message(STATUS "ARM detected")
+         list(APPEND GGML_CPU_SOURCES
+diff --git a/src/ggml-metal/CMakeLists.txt b/src/ggml-metal/CMakeLists.txt
+index 0ca8a3c5..9606a9ed 100644
+--- a/src/ggml-metal/CMakeLists.txt
++++ b/src/ggml-metal/CMakeLists.txt
+@@ -14,6 +14,11 @@ target_link_libraries(ggml-metal PRIVATE
+                       ${METALKIT_FRAMEWORK}
+                       )
+ 
++set(GGML_PKGCONFIG_LIBS_PRIVATE
++    "${GGML_PKGCONFIG_LIBS_PRIVATE} -framework Foundation -framework Metal -framework MetalKit"
++    PARENT_SCOPE
++)
++
+ if (GGML_METAL_NDEBUG)
+     add_compile_definitions(GGML_METAL_NDEBUG)
+ endif()
+diff --git a/src/ggml-opencl/CMakeLists.txt b/src/ggml-opencl/CMakeLists.txt
+index 9a7ccbcf..e4c110e6 100644
+--- a/src/ggml-opencl/CMakeLists.txt
++++ b/src/ggml-opencl/CMakeLists.txt
+@@ -7,6 +7,7 @@ ggml_add_backend_library(${TARGET_NAME}
+                          ggml-opencl.cpp
+                          ../../include/ggml-opencl.h)
+ target_link_libraries(${TARGET_NAME} PRIVATE ${OpenCL_LIBRARIES})
++set(GGML_PKGCONFIG_REQUIRES_PRIVATE "${GGML_PKGCONFIG_REQUIRES_PRIVATE} OpenCL" PARENT_SCOPE)
+ target_include_directories(${TARGET_NAME} PRIVATE ${OpenCL_INCLUDE_DIRS})
+ 
+ if (GGML_OPENCL_PROFILING)
+diff --git a/src/ggml-vulkan/CMakeLists.txt b/src/ggml-vulkan/CMakeLists.txt
+index b97e7bf9..ec194126 100644
+--- a/src/ggml-vulkan/CMakeLists.txt
++++ b/src/ggml-vulkan/CMakeLists.txt
+@@ -77,6 +77,11 @@ if (Vulkan_FOUND)
+     )
+ 
+     target_link_libraries(ggml-vulkan PRIVATE Vulkan::Vulkan)
++    if(ANDROID)
++        set(GGML_PKGCONFIG_LIBS_PRIVATE "${GGML_PKGCONFIG_LIBS_PRIVATE} -lvulkan" PARENT_SCOPE)
++    else()
++        set(GGML_PKGCONFIG_REQUIRES_PRIVATE "${GGML_PKGCONFIG_REQUIRES_PRIVATE} vulkan" PARENT_SCOPE)
++    endif()
+     target_include_directories(ggml-vulkan PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+ 
+     # Workaround to the "can't dereference invalidated vector iterator" bug in clang-cl debug build

ports/ggml/portfile.cmake

@@ -7,6 +7,7 @@ vcpkg_from_github(
     PATCHES
         android-vulkan.diff
         cmake-config.diff
+        pkgconfig.diff
         relax-link-options.diff
         vulkan-shaders-gen.diff
 )
@@ -79,28 +80,20 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME ggml CONFIG_PATH "lib/cmake/ggml")
 vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(PACKAGE_NAME ggml CONFIG_PATH "lib/cmake/ggml")
+vcpkg_fixup_pkgconfig()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ggml.h" "#ifdef GGML_SHARED" "#if 1")
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ggml-backend.h" "#ifdef GGML_BACKEND_SHARED" "#if 1")
 endif()
 
-if (NOT VCPKG_BUILD_TYPE)
-    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/ggml.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/ggml.pc")
-endif()
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
-file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/ggml.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/ggml.pc")
-vcpkg_fixup_pkgconfig()
-
 if("vulkan" IN_LIST FEATURES AND NOT VCPKG_CROSSCOMPILING)
     vcpkg_copy_tools(TOOL_NAMES vulkan-shaders-gen AUTO_CLEAN)
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/pkgconfig")
 
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

ports/ggml/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "ggml",
   "version-date": "2025-08-18",
+  "port-version": 1,
   "description": "Tensor library for machine learning",
   "homepage": "https://github.com/ggml-org/ggml",
   "license": "MIT",

ports/llama-cpp/pkgconfig.diff

@@ -0,0 +1,12 @@
+diff --git a/cmake/llama.pc.in b/cmake/llama.pc.in
+index 6fb58b5..8a283e7 100644
+--- a/cmake/llama.pc.in
++++ b/cmake/llama.pc.in
+@@ -6,5 +6,6 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ Name: llama
+ Description: Port of Facebook's LLaMA model in C/C++
+ Version: @LLAMA_INSTALL_VERSION@
+-Libs: -L${libdir} -lggml -lggml-base -lllama
++Requires: ggml
++Libs: -L${libdir} -lllama
+ Cflags: -I${includedir}

ports/llama-cpp/portfile.cmake

@@ -6,6 +6,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         cmake-config.diff
+        pkgconfig.diff
 )
 file(REMOVE_RECURSE "${SOURCE_PATH}/ggml/include" "${SOURCE_PATH}/ggml/src")
 

ports/llama-cpp/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "llama-cpp",
   "version": "6301",
+  "port-version": 1,
   "description": "LLM inference in C/C++",
   "homepage": "https://github.com/ggml-org/llama.cpp",
   "license": "MIT",

ports/whisper-cpp/cmake-config.diff

@@ -1,27 +1,33 @@
 diff --git a/cmake/whisper-config.cmake.in b/cmake/whisper-config.cmake.in
-index 6a3fa227..f1e06f6c 100644
+index 6a3fa227..f4f4162a 100644
 --- a/cmake/whisper-config.cmake.in
 +++ b/cmake/whisper-config.cmake.in
-@@ -12,8 +12,8 @@ set(GGML_ACCELERATE @GGML_ACCELERATE@)
+@@ -12,8 +12,9 @@ set(GGML_ACCELERATE @GGML_ACCELERATE@)
  @PACKAGE_INIT@
 
  set_and_check(WHISPER_INCLUDE_DIR "@PACKAGE_WHISPER_INCLUDE_INSTALL_DIR@")
 -set_and_check(WHISPER_LIB_DIR     "@PACKAGE_WHISPER_LIB_INSTALL_DIR@")
 -set_and_check(WHISPER_BIN_DIR     "@PACKAGE_WHISPER_BIN_INSTALL_DIR@")
-+#set_and_check(WHISPER_LIB_DIR     "@PACKAGE_WHISPER_LIB_INSTALL_DIR@")
-+#set_and_check(WHISPER_BIN_DIR     "@PACKAGE_WHISPER_BIN_INSTALL_DIR@")
++# In vcpkg, the following would be subject to vcpkg build type.
++# set_and_check(WHISPER_LIB_DIR     "@PACKAGE_WHISPER_LIB_INSTALL_DIR@")
++# set_and_check(WHISPER_BIN_DIR     "@PACKAGE_WHISPER_BIN_INSTALL_DIR@")
 
  # Ensure transient dependencies satisfied
 
-@@ -50,6 +50,7 @@ find_library(whisper_LIBRARY whisper
+@@ -50,6 +51,12 @@ find_library(whisper_LIBRARY whisper
  set(_whisper_link_deps "Threads::Threads" "@WHISPER_EXTRA_LIBS@")
  set(_whisper_transient_defines "@WHISPER_TRANSIENT_DEFINES@")
 
 +if(NOT TARGET whisper)
++if(NOT "@BUILD_SHARED_LIBS@")
++    include(CMakeFindDependencyMacro)
++    find_dependency(ggml)
++    list(APPEND _whisper_link_deps ggml::ggml)
++endif()
  add_library(whisper UNKNOWN IMPORTED)
 
  set_target_properties(whisper
-@@ -61,5 +62,6 @@ set_target_properties(whisper
+@@ -61,5 +68,6 @@ set_target_properties(whisper
          IMPORTED_LOCATION "${whisper_LIBRARY}"
          INTERFACE_COMPILE_FEATURES cxx_std_11
          POSITION_INDEPENDENT_CODE ON )

ports/whisper-cpp/pkgconfig.diff

@@ -0,0 +1,12 @@
+diff --git a/cmake/whisper.pc.in b/cmake/whisper.pc.in
+index 00ec7912..ccc2efbb 100644
+--- a/cmake/whisper.pc.in
++++ b/cmake/whisper.pc.in
+@@ -6,5 +6,6 @@ includedir=${prefix}/include
+ Name: whisper
+ Description: Port of OpenAI's Whisper model in C/C++
+ Version: @PROJECT_VERSION@
+-Libs: -L${libdir} -lggml  -lggml-base -lwhisper
++Libs: -L${libdir} -lwhisper
++Requires.private: ggml
+ Cflags: -I${includedir}

ports/whisper-cpp/portfile.cmake

@@ -6,26 +6,27 @@ vcpkg_from_github(
     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_CCACHE=OFF
         -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_cmake_config_fixup(CONFIG_PATH "lib/cmake/whisper")
 vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/whisper")
 vcpkg_fixup_pkgconfig()
 
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
 file(INSTALL "${SOURCE_PATH}/models/convert-pt-to-ggml.py" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

ports/whisper-cpp/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "whisper-cpp",
   "version": "1.7.6",
+  "port-version": 1,
   "description": "Port of OpenAI's Whisper model in C/C++",
   "homepage": "https://github.com/ggml-org/whisper.cpp",
   "license": "MIT",