[vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries (#11550)

* [vcpkg/scripts/pkgconfig] rewrite pkgconfig check for libraries.

* [vcpkg/scripts/pkgconfig] fix more details.

* [vcpkg/scripts/pkgconfig] smaller improvements

* ws change to check functionallity of script for testing.

* [vcpkg/scripts/pkgconfig] update to latest test version

* Revert "ws change to check functionallity of script for testing."

This reverts commit 26269e9e776009230777d9390465715f2ebac465.

* [nettle] bump control for vcpkg_fixup_pkgconfig test

* [gmp] rerun CI to create new *.pc files

* [gmp/nettle] enable port debug

* [vcpkg/script/pkgconfig] fix path conversion regex for CI

* [CI|OSX] install pkg-config on osx

* [gmp/nettle] disable port debug

* [vcpkg/scripts/pkgconfig] update to latest version of x windows pr

* [zlib] add pkgconfig file

* [zstd] add fixup pkgconfig

* [libpng] add pc file installation

* [bzip2] install pc file and leave a TODO for somebody else ;)

* [bzip2] bump control

* [vcpkg/scripts/pkgconfig] skip checks if pkgconfig cannot be found.
- small bugfix in ignore flags regex

* retry zstd and zlib

* [libpng] retry by adding dl and m to system libraries for osx

* [libpng] add missing vcpkg_fixup_pkgconfig()

* [vcpkg/scripts/pkgconfig] unset var if found. 

fixes checks for other configurations which will be always succesful otherwise

* [libpng] bump control

* [libpng] enable port debug to debug osx regression

* ws change to retrigger osx ci and hopeing that it works

* fix typo

* [libpng] remove -lm flag on apple platforms

* ws change to rerun some ports in ci for good measure after the merge with master

* Re-trigger CI test

* [zstd] add pkgconfig

* [zstd] correct debug link

* [vcpkg/script/pkgconfig] - add more search suffixes for static libs
- add additional debug messages for debuging
- fix unsetting of cache variables hiding issues with debug libraries
- fixed pkgconfig fix in the debug case

* [pcre] add pthread dependency to pcre

* [protobuf] fix pkgconfig

* include quotes around the prefix in the case the prefix path was quoted (fixes some regressions)
add option NOT_STATIC_PKGCONFIG to run pkg-config without the --static argument

* [ignition-msgs5] get rid of a dev warning

* [apr] fix apr regression

* [protobuf] fix protobuf regression

* [sdl1] fix regression due to variable expansion of pkg-config. Use similar regex to the library removal for ignored flags.

* [ignition] fix regression

* remove changes of zlib portfile.

* reset changes in osx ci pipeline

* add DISABLE_PARALLEL_CONFIGURE

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Billy Robert O'Neal <bion@microsoft.com>

3 files changed, 28 insertions, 9 deletions

diff --git a/ports/bzip2/CONTROL b/ports/bzip2/CONTROL
index 695925c07..4734c4171 100644
--- a/ports/bzip2/CONTROL
+++ b/ports/bzip2/CONTROL
@@ -1,4 +1,4 @@
 Source: bzip2

-Version: 1.0.6-5

+Version: 1.0.6-6

 Homepage: http://www.bzip.org/

 Description: High-quality data compressor.

diff --git a/ports/bzip2/bzip2.pc.in b/ports/bzip2/bzip2.pc.in
new file mode 100644
index 000000000..91153c13b
--- /dev/null
+++ b/ports/bzip2/bzip2.pc.in
@@ -0,0 +1,11 @@
+prefix=@BZIP2_PREFIX@

+exec_prefix=${prefix}

+libdir=${prefix}/lib

+includedir=${prefix}/include

+

+Name: bzip2

+Description: bzip2

+Version: 1.0.6

+Requires: 

+Libs: -L${libdir} -l@bzname@

+Cflags: -I${includedir}
\ No newline at end of file
diff --git a/ports/bzip2/portfile.cmake b/ports/bzip2/portfile.cmake
index 0462d53eb..571c84948 100644
--- a/ports/bzip2/portfile.cmake
+++ b/ports/bzip2/portfile.cmake
@@ -1,6 +1,6 @@
 include(vcpkg_common_functions)

-set(BZIP2_VERSION 1.0.6)

-vcpkg_download_distfile(ARCHIVE

+set(BZIP2_VERSION 1.0.6) # TODO: Update to 1.0.8

+vcpkg_download_distfile(ARCHIVE # TODO: switch to vcpkg_from_git with https://sourceware.org/git/?p=bzip2.git;a=summary

     URLS "https://github.com/past-due/bzip2-mirror/releases/download/v${BZIP2_VERSION}/bzip2-${BZIP2_VERSION}.tar.gz"

     FILENAME "bzip2-${BZIP2_VERSION}.tar.gz"

     SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12)

@@ -14,7 +14,7 @@ vcpkg_extract_source_archive_ex(
         fix-windows-include.patch

 )

 

-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})

+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")

 

 vcpkg_configure_cmake(

     SOURCE_PATH ${SOURCE_PATH}

@@ -27,17 +27,25 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()

 vcpkg_copy_pdbs()

 

-file(READ ${CURRENT_PACKAGES_DIR}/include/bzlib.h BZLIB_H)

+file(READ "${CURRENT_PACKAGES_DIR}/include/bzlib.h" BZLIB_H)

 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")

     string(REPLACE "defined(BZ_IMPORT)" "0" BZLIB_H "${BZLIB_H}")

 else()

     string(REPLACE "defined(BZ_IMPORT)" "1" BZLIB_H "${BZLIB_H}")

 endif()

-file(WRITE ${CURRENT_PACKAGES_DIR}/include/bzlib.h "${BZLIB_H}")

+file(WRITE "${CURRENT_PACKAGES_DIR}/include/bzlib.h" "${BZLIB_H}")

 

-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/bzip2)

-file(RENAME ${CURRENT_PACKAGES_DIR}/share/bzip2/LICENSE ${CURRENT_PACKAGES_DIR}/share/bzip2/copyright)

+file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/bzip2")

+file(RENAME "${CURRENT_PACKAGES_DIR}/share/bzip2/LICENSE" "${CURRENT_PACKAGES_DIR}/share/bzip2/copyright")

 

-file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})

+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

 

 vcpkg_test_cmake(PACKAGE_NAME BZip2 MODULE)

+

+set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}")

+set(bzname bz2)

+configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/bzip2.pc" @ONLY)

+set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}/debug")

+set(bzname bz2d)

+configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/bzip2.pc" @ONLY)

+vcpkg_fixup_pkgconfig()
\ No newline at end of file