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

Jump to bottom

pkg-config, pkgconf: Misc fixes #88518

Merged
merged 7 commits into from May 21, 2020
Merged

pkg-config, pkgconf: Misc fixes #88518

merged 7 commits into from May 21, 2020

Conversation

Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented May 21, 2020 •
edited

Motivation for this change

See each commit for details. Most importantly this fixes builds using pkg-config-provided macros, like libarchive.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Ericson2314
pkg-config: Document new location of bug
26f635d
@Ericson2314
pkg-config: If building vanilla version, can run original tests
42b2035
@Ericson2314
pkg-config: Multiple outputs
f29919d 
This is good practice, and will help with tests. Wrapper adjust to match
bintools-wrapper re these new outputs.
@Ericson2314
pkg-config-wrapper: Provide autoconf macros
4b2ab66 
This fixes libarchive, and probably numerous other builds.
@Ericson2314 Ericson2314 mentioned this pull request May 21, 2020
Closed
10 tasks
@Ericson2314 Ericson2314 changed the title pkg-config: Misc fixes pkg-config, pkgconf: Misc fixes May 21, 2020
@Ericson2314
pkgconf: Multiple outputs
23490e3
@Ericson2314
pkgconf: Wrap with pkg-config-wrapper
95080ea
@Ericson2314
pkg-config-wrapper: Move comments outside of strings
7e9d807 
This is much better because then we can freely keep the comments up to
date without causing mass rebuilds.

Someday, somebody should make the same change with `cc-wrapper` and
`bintools-wrapper`.
@ofborg ofborg bot requested review from edolstra, lovek323, np, andir and zaninime May 21, 2020 15:47
@Ericson2314
Copy link
Member Author

OK not sure why that one ofborg job is stalled, I built everything locally.

@Ericson2314 Ericson2314 merged commit eae4f22 into NixOS:staging May 21, 2020
@Ericson2314 Ericson2314 deleted the fix-pkg-config branch May 21, 2020 20:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bhipple bhipple bhipple left review comments

@edolstra edolstra Awaiting requested review from edolstra

@lovek323 lovek323 Awaiting requested review from lovek323

@np np Awaiting requested review from np

@andir andir Awaiting requested review from andir

@zaninime zaninime Awaiting requested review from zaninime

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Ericson2314 @bhipple