[vcpkg_fixup_pkgconfig] Handle spaces in path, do not validate individual libraries (#13126)

9 files changed, 27 insertions, 7 deletions

diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake
index d106217e6..fd8d0ec40 100644
--- a/ports/ceres/portfile.cmake
+++ b/ports/ceres/portfile.cmake
@@ -41,6 +41,8 @@ vcpkg_configure_cmake(
         -DBUILD_BENCHMARKS=OFF
         -DBUILD_EXAMPLES=OFF
         -DBUILD_TESTING=OFF
+        -DBUILD_BENCHMARKS=OFF
+        -DPROVIDE_UNINSTALL_TARGET=OFF
         -DMSVC_USE_STATIC_CRT=${MSVC_USE_STATIC_CRT_VALUE}
         -DLIB_SUFFIX=${LIB_SUFFIX}
 )
diff --git a/ports/libbson/CONTROL b/ports/libbson/CONTROL
index 6c929c883..c74336ee5 100644
--- a/ports/libbson/CONTROL
+++ b/ports/libbson/CONTROL
@@ -1,5 +1,5 @@
 Source: libbson
 Version: 1.16.1
-Port-Version: 1
+Port-Version: 2
 Description: libbson is a library providing useful routines related to building, parsing, and iterating BSON documents.
 Homepage: https://github.com/mongodb/libbson
diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake
index 8430b3ef6..477f2eb67 100644
--- a/ports/libbson/portfile.cmake
+++ b/ports/libbson/portfile.cmake
@@ -20,6 +20,8 @@ file(READ ${CMAKE_CURRENT_LIST_DIR}/CONTROL _contents)
 string(REGEX MATCH "\nVersion:[ ]*[^ \n]+" _contents "${_contents}")
 string(REGEX REPLACE ".+Version:[ ]*([\\.0-9]+).*" "\\1" BUILD_VERSION "${_contents}")
 
+file(WRITE "${BUILD_VERSION}" ${SOURCE_PATH}/VERSION_CURRENT)
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
@@ -31,6 +33,7 @@ vcpkg_configure_cmake(
         -DENABLE_EXAMPLES=OFF
         -DENABLE_STATIC=${ENABLE_STATIC}
         -DBUILD_VERSION=${BUILD_VERSION}
+        -DCMAKE_DISABLE_FIND_PACKAGE_PythonInterp=ON
 )
 
 vcpkg_install_cmake()
@@ -44,6 +47,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
 else()
     vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libbson-${PORT_POSTFIX} TARGET_PATH share/bson-${PORT_POSTFIX})
 endif()
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/mongo-c-driver)
 
diff --git a/ports/mongo-c-driver/CONTROL b/ports/mongo-c-driver/CONTROL
index 7bbddb172..5cc9c336e 100644
--- a/ports/mongo-c-driver/CONTROL
+++ b/ports/mongo-c-driver/CONTROL
@@ -1,6 +1,6 @@
 Source: mongo-c-driver
-Version: 1.16.1-1
-Port-Version: 1
+Version: 1.16.1
+Port-Version: 3
 Build-Depends: libbson, openssl (!windows), zlib
 Description: Client library written in C for MongoDB.
 Homepage: https://github.com/mongodb/mongo-c-driver
diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake
index 74a1d8c0d..9ddf3a6b4 100644
--- a/ports/mongo-c-driver/portfile.cmake
+++ b/ports/mongo-c-driver/portfile.cmake
@@ -40,6 +40,8 @@ file(READ ${CMAKE_CURRENT_LIST_DIR}/CONTROL _contents)
 string(REGEX MATCH "\nVersion:[ ]*[^ \n]+" _contents "${_contents}")
 string(REGEX REPLACE ".+Version:[ ]*([\\.0-9]+).*" "\\1" BUILD_VERSION "${_contents}")
 
+file(WRITE "${BUILD_VERSION}" ${SOURCE_PATH}/VERSION_CURRENT)
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
@@ -55,6 +57,7 @@ vcpkg_configure_cmake(
         -DENABLE_ZLIB=SYSTEM
         -DENABLE_STATIC=${ENABLE_STATIC}
         -DBUILD_VERSION=${BUILD_VERSION}
+        -DCMAKE_DISABLE_FIND_PACKAGE_PythonInterp=ON
         ${FEATURE_OPTIONS}
 )
 
diff --git a/ports/nettle/CONTROL b/ports/nettle/CONTROL
index 49308ce95..e8cffedd7 100644
--- a/ports/nettle/CONTROL
+++ b/ports/nettle/CONTROL
@@ -1,6 +1,6 @@
 Source: nettle

 Version: 3.5.1

-Port-Version: 4

+Port-Version: 5

 Homepage: https://git.lysator.liu.se/nettle/nettle

 Description: Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space.

 Build-Depends: gmp, vs-yasm (windows), yasm-tool-helper (windows)

diff --git a/ports/nettle/portfile.cmake b/ports/nettle/portfile.cmake
index 2d3fc952a..616d9af28 100644
--- a/ports/nettle/portfile.cmake
+++ b/ports/nettle/portfile.cmake
@@ -84,7 +84,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
     set(exec_prefix "\${prefix}")

     set(libdir "\${prefix}/lib")

     set(includedir "\${prefix}/include")

-    set(LIBS -lnettle -lgmp)

+    set(LIBS "-lnettle -lgmp")

     configure_file("${SOURCE_PATH}/nettle.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/nettle.pc" @ONLY)

     set(HOGWEED -lhogweed)

     set(LIBS -lnettle)

@@ -93,7 +93,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
     set(exec_prefix "\${prefix}")

     set(libdir "\${prefix}/lib")

     set(includedir "\${prefix}/../include")

-    set(LIBS -lnettled -lgmpd)

+    set(LIBS "-lnettled -lgmpd")

     configure_file("${SOURCE_PATH}/nettle.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/nettle.pc" @ONLY)

     set(LIBS -lnettled)

     set(HOGWEED -lhogweedd)

diff --git a/ports/x265/CONTROL b/ports/x265/CONTROL
index 58fe1b99e..269a4c30d 100644
--- a/ports/x265/CONTROL
+++ b/ports/x265/CONTROL
@@ -1,5 +1,5 @@
 Source: x265
 Version: 3.4
-Port-Version: 1
+Port-Version: 2
 Homepage: https://github.com/videolan/x265
 Description: x265 is a H.265 / HEVC video encoder application library, designed to encode video or images into an H.265 / HEVC encoded bitstream.
diff --git a/ports/x265/portfile.cmake b/ports/x265/portfile.cmake
index 754e4127f..01fa6688d 100644
--- a/ports/x265/portfile.cmake
+++ b/ports/x265/portfile.cmake
@@ -63,6 +63,17 @@ if(VCPKG_TARGET_IS_MINGW AND ENABLE_SHARED)
 endif()
 
 if(UNIX)
+    foreach(FILE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x265.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x265.pc")
+        if(EXISTS "${FILE}")
+            file(READ "${FILE}" _contents)
+            string(REPLACE " -lstdc++" "" _contents "${_contents}")
+            string(REPLACE " -lc++" "" _contents "${_contents}")
+            string(REPLACE " -lgcc_s" "" _contents "${_contents}")
+            string(REPLACE " -lgcc" "" _contents "${_contents}")
+            string(REPLACE " -lrt" "" _contents "${_contents}")
+            file(WRITE "${FILE}" "${_contents}")
+        endif()
+    endforeach()
     vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES numa)
 else()
     vcpkg_fixup_pkgconfig()