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.

Sign up for GitHub

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

Jump to bottom

MesonToolchain: add pkg-config entry to generated machine file #15369

Merged
merged 1 commit into from
Jan 2, 2024
Merged

MesonToolchain: add pkg-config entry to generated machine file #15369

merged 1 commit into from
Jan 2, 2024

Conversation

SpaceIm
Copy link
Contributor

@SpaceIm SpaceIm commented Dec 31, 2023 •
edited by czoido
Loading

Changelog: Fix: Add pkg-config entry to machine file generated by MesonToolchain, due to pkgconfig entry being deprecated since Meson 1.3.0.
Docs: Omit

closes #15190

  • Refer to the issue that supports this Pull Request.
  • If the issue has missing info, explain the purpose/use case/pain/need that covers this Pull Request.
  • I've read the Contributing guide.
  • I've followed the PEP8 style guides for Python code.
  • I've opened another PR in the Conan docs repo to the develop branch, documenting this one.

@SpaceIm
add pkg-config entry in machine file generated by MesonToolchain
2e56d10 
pkgconfig entry is deprecated in favor of pkg-config since Meson 1.3.0 (see https://mesonbuild.com/Release-notes-for-1-3-0.html#machine-files-pkgconfig-field-deprecated-and-replaced-by-pkgconfig).
Defining both pkgconfig & pkg-config allows to silent deprecation warnings, and ensures forward & backward compatibility.
AbrilRBS
AbrilRBS approved these changes Jan 2, 2024
View reviewed changes
Copy link
Member

@AbrilRBS AbrilRBS left a comment

Choose a reason for hiding this comment

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

This inconsistency is now fixed by deprecating pkgconfig in favor of pkg-config which matches the name of the binary. For backward compatibility it is still allowed to define both with the same value, in that case no deprecation warning is printed.

From https://mesonbuild.com/Release-notes-for-1-3-0.html#machine-files-pkgconfig-field-deprecated-and-replaced-by-pkgconfig

@AbrilRBS AbrilRBS added this to the 2.1 milestone Jan 2, 2024
@memsharded memsharded merged commit e943f6c into conan-io:develop2 Jan 2, 2024
2 checks passed
@SpaceIm SpaceIm deleted the mesontoolchain-pkg-config-machine-file branch January 2, 2024 10:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@memsharded memsharded memsharded approved these changes

@AbrilRBS AbrilRBS AbrilRBS approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.1.0
Development

Successfully merging this pull request may close these issues.

[feature] MesonToolchain: DEPRECATION: "pkgconfig" entry is deprecated and should be replaced by "pkg-config"
3 participants
@SpaceIm @AbrilRBS @memsharded