microsoft · BillyONeal · Dec 8, 2020 · Aug 25, 2020 · Aug 25, 2020 · Aug 25, 2020
diff --git a/docs/maintainers/vcpkg_fixup_pkgconfig.md b/docs/maintainers/vcpkg_fixup_pkgconfig.md
@@ -7,8 +7,6 @@ Fix common paths in *.pc files and make everything relativ to $(prefix)
 vcpkg_fixup_pkgconfig(
     [RELEASE_FILES <PATHS>...]
     [DEBUG_FILES <PATHS>...]
-    [SYSTEM_LIBRARIES <NAMES>...]
-    [IGNORE_FLAGS <FLAGS>]
     [SKIP_CHECK]
 )
 ```
@@ -22,21 +20,24 @@ Defaults to every *.pc file in the folder ${CURRENT_PACKAGES_DIR} without ${CURR
 Specifies a list of files to apply the fixes for debug paths.
 Defaults to every *.pc file in the folder ${CURRENT_PACKAGES_DIR}/debug/
 
-### SYSTEM_LIBRARIES
-If the *.pc file contains system libraries outside vcpkg these need to be listed here.
-VCPKG checks every -l flag for the existence of the required library within vcpkg.
+### SKIP_CHECK
+Skips the library checks in vcpkg_fixup_pkgconfig. Only use if the script itself has unhandled cases.
 
-### IGNORE_FLAGS
-If the *.pc file contains flags in the lib field which are not libraries. These can be listed here
+### SYSTEM_PACKAGES (deprecated)
+This argument has been deprecated and has no effect.
 
-### SKIP_CHECK
-Skips the library checks in vcpkg_fixup_pkgconfig. Only use if the script itself has unhandled cases. 
+### SYSTEM_LIBRARIES (deprecated)
+This argument has been deprecated and has no effect.
+
+### IGNORE_FLAGS (deprecated)
+This argument has been deprecated and has no effect.
 
 ## Notes
 Still work in progress. If there are more cases which can be handled here feel free to add them
 
 ## Examples
-Just call `vcpkg_fixup_pkgconfig()` after any install step which installs *.pc files.
+
+* [brotli](https://github.com/Microsoft/vcpkg/blob/master/ports/brotli/portfile.cmake)
 
 ## Source
 [scripts/cmake/vcpkg_fixup_pkgconfig.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_fixup_pkgconfig.cmake)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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()

diff --git a/scripts/azure-pipelines/end-to-end-tests.ps1 b/scripts/azure-pipelines/end-to-end-tests.ps1
@@ -91,6 +91,18 @@ function Run-Vcpkg {
     ./vcpkg @testArgs
 }
 
+##### Test spaces in the path
+Refresh-TestRoot
+$CurrentTest = "zlib with spaces in path"
+Write-Host $CurrentTest
+./vcpkg install zlib "--triplet" $Triplet `
+    "--no-binarycaching" `
+    "--x-buildtrees-root=$TestingRoot/build Trees" `
+    "--x-install-root=$TestingRoot/instalL ed" `
+    "--x-packages-root=$TestingRoot/packaG es"
+Throw-IfFailed
+
+##### Binary caching tests
 if (-not $IsLinux -and -not $IsMacOS) {
     Refresh-TestRoot
     # Test msbuild props and targets