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] Use pkgconf in vcpkg pkgconfig get modules #20527

Conversation

Neumann-A
Copy link
Contributor

No description provided.

Copy link
Contributor

@ras0219-msft ras0219-msft left a comment

Choose a reason for hiding this comment

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

This is delightful!

@Neumann-A
Copy link
Contributor Author

This is delightful!

i wanted to apply it to other stuff too but the script audit is kind of slow for the make and fixup pkgconfig stuff. so i started here.

@JackBoosY JackBoosY added the category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly label Oct 8, 2021
@Neumann-A Neumann-A marked this pull request as ready for review October 23, 2021 22:07
@PhoebeHui PhoebeHui added the requires:vcpkg-team-review This PR or issue requires someone on the vcpkg team to take a further look. label Dec 7, 2021
Neumann-A and others added 2 commits December 27, 2021 17:52
…s.cmake

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 431d3810aa9241aed49b14367be417f225d2af5e -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/v-/vcpkg-pkgconfig-get-modules.json b/versions/v-/vcpkg-pkgconfig-get-modules.json
index 5a8b351..5bda670 100644
--- a/versions/v-/vcpkg-pkgconfig-get-modules.json
+++ b/versions/v-/vcpkg-pkgconfig-get-modules.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "e34705e29ded3234cf8c21d7802c02a855a01ecb",
+      "git-tree": "7c13e64cd017abd44a8f473f61fdf0d1fc41f5a9",
       "version-date": "2021-10-05",
       "port-version": 0
     },

@JackBoosY
Copy link
Contributor

Ping @ras0219-msft for reply.

Copy link
Contributor

@ras0219-msft ras0219-msft left a comment

Choose a reason for hiding this comment

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

LGTM, sorry for the long delay in getting back to this!

A bit more information on why burning it into the file is the correct approach right now: it improves resilience in classic mode under certain (extremely suspect) configurations. It has no effect on manifest mode and as @BillyONeal mentioned we currently include the triplet names into the ABIs so it doesn't introduce any dependence that isn't already present.

@ras0219-msft
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@JackBoosY JackBoosY removed the requires:vcpkg-team-review This PR or issue requires someone on the vcpkg team to take a further look. label Jan 29, 2022
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/vcpkg-pkgconfig-get-modules/vcpkg.json

Valid values for the license field are listed at https://spdx.org/licenses/

@PhoebeHui PhoebeHui added the info:reviewed Pull Request changes follow basic guidelines label Jan 30, 2022
@ras0219-msft ras0219-msft merged commit 84d9d9b into microsoft:master Feb 1, 2022
@Neumann-A Neumann-A deleted the use_pkgconf_in_vcpkg_pkgconfig_get_modules branch February 1, 2022 07:06
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.

None yet

6 participants