diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-07-24 20:39:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-24 11:39:21 -0700 |
| commit | 458c20e94b9f558b523f187ce403bd062e131cdb (patch) | |
| tree | 20fd042b01a4c1090d7cb239dc17da0d9e97b02b /ports/apr | |
| parent | 077c0746be3773fdd443af52cbe5c3cc26379a15 (diff) | |
| download | vcpkg-458c20e94b9f558b523f187ce403bd062e131cdb.tar.gz vcpkg-458c20e94b9f558b523f187ce403bd062e131cdb.zip | |
[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>
Diffstat (limited to 'ports/apr')
| -rw-r--r-- | ports/apr/CONTROL | 3 | ||||
| -rw-r--r-- | ports/apr/portfile.cmake | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ports/apr/CONTROL b/ports/apr/CONTROL index 607f6c4d4..2c9c0c691 100644 --- a/ports/apr/CONTROL +++ b/ports/apr/CONTROL @@ -1,5 +1,6 @@ Source: apr -Version: 1.7.0-1 +Version: 1.7.0 +Port-Version: 2 Homepage: https://apr.apache.org/ Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems. Supports: !uwp diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index b3ede1a1d..39f237001 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -82,7 +82,7 @@ else() vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/lib/pkgconfig/apr-1.pc "-lapr-\${APR_MAJOR_VERSION}" "-lapr-1" ) - vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread rt dl) + vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread rt dl uuid crypt) endif() # Handle copyright |
