-
Notifications
You must be signed in to change notification settings - Fork 6.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[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 26269e9. * [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>
- Loading branch information
1 parent
077c074
commit 458c20e
Showing
25 changed files
with
418 additions
and
182 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
Source: gmp | ||
Version: 6.2.0-1 | ||
Version: 6.2.0-2 | ||
Homepage: https://gmplib.org/ | ||
Description: The GNU Multiple Precision Arithmetic Library | ||
Build-Depends: vs-yasm (windows) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
Source: ignition-modularscripts | ||
Version: 2020-05-16 | ||
Port-Version: 1 | ||
Description: Vcpkg helpers to package ignition libraries |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
Source: ignition-msgs5 | ||
Version: 5.1.0 | ||
Port-Version: 1 | ||
Build-Depends: ignition-modularscripts, ignition-cmake2, ignition-math6, protobuf, tinyxml2 | ||
Description: Middleware protobuf messages for robotics | ||
Supports: !(arm|linux|uwp) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 6f85d17ef..8de0eb299 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -814,20 +814,31 @@ endif() | ||
# Only do this on Windows for Cygwin - the files don't make much sense outside | ||
# of a UNIX look-alike. | ||
if(NOT WIN32 OR CYGWIN OR MINGW) | ||
- set(prefix ${CMAKE_INSTALL_PREFIX}) | ||
- set(exec_prefix ${CMAKE_INSTALL_PREFIX}) | ||
- set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) | ||
- set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) | ||
- set(LIBS "-lz -lm") | ||
+ set(LIBS "-lz") | ||
+ if(NOT APPLE) | ||
+ string(APPEND LIBS " -lm") | ||
+ endif() | ||
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in | ||
- ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY) | ||
- create_symlink(libpng.pc FILE ${PNGLIB_NAME}.pc) | ||
- | ||
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in | ||
- ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config @ONLY) | ||
create_symlink(libpng-config FILE ${PNGLIB_NAME}-config) | ||
+else() | ||
+ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") | ||
+ set(LIBS "-lzlibd") | ||
+ else() | ||
+ set(LIBS "-lzlib") | ||
+ endif() | ||
endif() | ||
|
||
+set(prefix ${CMAKE_INSTALL_PREFIX}) | ||
+set(exec_prefix ${CMAKE_INSTALL_PREFIX}) | ||
+set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) | ||
+set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) | ||
+ | ||
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in | ||
+ ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY) | ||
+create_symlink(libpng.pc FILE ${PNGLIB_NAME}.pc) | ||
+ | ||
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in | ||
+ ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config @ONLY) | ||
+ | ||
# SET UP LINKS | ||
if(PNG_SHARED) | ||
set_target_properties(png PROPERTIES |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 6599e1d7d..c0bb2fad2 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -894,13 +894,13 @@ if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL) | ||
install(FILES libpng.3 libpngpf.3 DESTINATION ${PNG_MAN_DIR}/man3) | ||
install(FILES png.5 DESTINATION ${PNG_MAN_DIR}/man5) | ||
# Install pkg-config files | ||
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc | ||
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) | ||
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc | ||
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) | ||
if(NOT CMAKE_HOST_WIN32 OR CYGWIN OR MINGW) | ||
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc | ||
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) | ||
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config | ||
- DESTINATION bin) | ||
+ DESTINATION tools/libpng) | ||
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc | ||
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) | ||
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config | ||
- DESTINATION bin) | ||
+ DESTINATION tools/libpng) | ||
endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
Source: nettle | ||
Version: 3.5.1-1 | ||
Version: 3.5.1-2 | ||
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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
Source: pcre | ||
Version: 8.44 | ||
Port-Version: 5 | ||
Port-Version: 6 | ||
Homepage: https://www.pcre.org/ | ||
Description: Perl Compatible Regular Expressions |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
Source: sdl1 | ||
Version: 1.2.15-11 | ||
Version: 1.2.15 | ||
Port-Version: 12 | ||
Homepage: https://www.libsdl.org | ||
Description: Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.