Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged

Conversation

Neumann-A
Copy link
Contributor

@Neumann-A Neumann-A commented May 24, 2020

closes #11103

  • Testing with X windows PR (Linux)
  • Testing with X windows PR (Windows) (ran until xlib and than run into other problems)

@JackBoosY
Copy link
Contributor

Maybe we should choose one port to test this PR?

ports/x264/portfile.cmake Outdated Show resolved Hide resolved
@JackBoosY JackBoosY changed the title [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries. [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries May 26, 2020
@Neumann-A
Copy link
Contributor Author

@JackBoosY: osx has no pkg-config installed?

@JackBoosY
Copy link
Contributor

Yes, please install brew install pkgconfig here:

brew list libtool || brew install libtool

@JackBoosY JackBoosY added the depends:vm-update PR contains changes to the VM provisioning scripts label May 28, 2020
@Neumann-A
Copy link
Contributor Author

@JackBoosY: Done

@Neumann-A Neumann-A marked this pull request as ready for review May 28, 2020 11:55
@JackBoosY JackBoosY added info:reviewed Pull Request changes follow basic guidelines requires:discussion and removed requires:author-response labels May 29, 2020
@JackBoosY
Copy link
Contributor

Looks good in my side.

@microsoft microsoft deleted a comment from azure-pipelines bot Jul 13, 2020
@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@Neumann-A Neumann-A mentioned this pull request Jul 13, 2020
@Neumann-A
Copy link
Contributor Author

currently checking why there is no regression in zstd. according to #12407 there should be a regression

- add additional debug messages for debuging
- fix unsetting of cache variables hiding issues with debug libraries
- fixed pkgconfig fix in the debug case
…fig_to_fixup_pkgconfig

# Conflicts:
#	ports/zstd/CONTROL
#	ports/zstd/portfile.cmake
…ed (fixes some regressions)

add option NOT_STATIC_PKGCONFIG to run pkg-config without the --static argument
…milar regex to the library removal for ignored flags.
@Neumann-A
Copy link
Contributor Author

Neumann-A commented Jul 16, 2020

@ras0219-msft: Should have 561287c triggered a full rebuild after 5ccacd4?

Please rerun failing CIs. This PR should be green now.

@BillyONeal
Copy link
Member

@Neumann-A Easiest way to force that is to push a merge with master; in this case there are merge conflicts

@Neumann-A
Copy link
Contributor Author

The ompl:x86-windows regressions seems unrelated. Worked locally and error in CI is:

CMake Error at tests/CMakeLists.txt:16 (configure_file):
  configure_file Problem configuring file

@JackBoosY
Copy link
Contributor

@ras0219-msft @ras0219 ping for merge this PR.

@ras0219-msft
Copy link
Contributor

LGTM, thanks @Neumann-A for the continued awesome work on this!

I think that it will eventually make sense to move the "checking" parts of this into the vcpkg tool itself, to ensure it is always run on any .pc files left in the tree, but this is great for now.

hellozee pushed a commit to hellozee/vcpkg that referenced this pull request Sep 11, 2020
…rosoft#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>
@Neumann-A Neumann-A deleted the use_pkg_config_to_fixup_pkgconfig branch November 18, 2020 20:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[vcpkg] TODO: Use pkg-config in vcpkg_fixup_pkgconfig to check for libraries
4 participants