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

fix PkgConfigDeps in build context #15763

Merged
merged 1 commit into from
Feb 27, 2024

Conversation

memsharded
Copy link
Member

@memsharded memsharded commented Feb 27, 2024

Changelog: Bugfix: Fix PkgConfigDeps generating .pc files for its tool_requires when it is in the build context already.
Docs: Omit

Close #14920

I have already tried to backport this to Conan 1.X, but it seems it is not possible, because the graph model there does not support the correct processing of tool_requires when already in the build context.

:param build_context_suffix: `dict` with all the suffixes
:return: `str` with the suffix
"""
if not build_context_suffix or not req.is_build_context:
if not build_context_suffix or not req.build:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch 👏

It has to be solved for BazelDeps too.

@franramirez688 franramirez688 merged commit 5ab37ed into conan-io:develop2 Feb 27, 2024
2 checks passed
@memsharded memsharded deleted the fix/pkgconfigdeps branch February 27, 2024 15:07
memsharded added a commit to memsharded/conan that referenced this pull request Mar 3, 2024
czoido pushed a commit that referenced this pull request Mar 13, 2024
* wip

* wip

* wip

* wip

* wip

* wip

* package_id config_mode

* test

* wip

* trying auto

* wip

* fix conan_server timestamp truncation

* fix test

* wip

* wip

* lockfiles

* Update conan/cli/commands/config.py

Co-authored-by: Francisco Ramírez <[email protected]>

* Update conans/client/graph/graph_binaries.py

Co-authored-by: Francisco Ramírez <[email protected]>

* Update conans/test/functional/command/config_install_test.py

Co-authored-by: Francisco Ramírez <[email protected]>

* Fix `conan profile show --format=json` for profiles with scoped confs (#15747)

Fix conan profile show --format=json for profiles with scopd confs

* review

* fix issues and improve CMakeToolchain.preprocessor (#15756)

* fix issues and improve CMakeToolchain.preprocessor

* fix test

* list --profile argument (#15697)

* list --profile argument

* filtering

* fix PkgConfigDeps in build context (#15763)

fix PkgConfigDeps

* [CMakeToolchain]Adding visibility flag to CONAN_C_FLAGS (#15762)

Adding visibility flags to C flags too

* PkgConfigDeps refactor (#15771)

* allow self.name/self.version for build_folder_vars (#15705)

* wip

* wip

* wip

* wip

---------

Co-authored-by: Francisco Ramírez <[email protected]>
Co-authored-by: Rubén Rincón Blanco <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants