Skip to content

glibc: avoid overriding makeFlags#368865

Merged
Ma27 merged 1 commit intoNixOS:stagingfrom
mjoerg:glibc-fix-make-flags
Jan 2, 2025
Merged

glibc: avoid overriding makeFlags#368865
Ma27 merged 1 commit intoNixOS:stagingfrom
mjoerg:glibc-fix-make-flags

Conversation

@mjoerg
Copy link
Contributor

@mjoerg mjoerg commented Dec 28, 2024 •
edited
Loading

Description of changes

fixes regression introduced in #357052
fixes build of glibcInfo (https://hydra.nixos.org/build/282565522)

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Dec 28, 2024
@ofborg ofborg bot added the 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. label Dec 28, 2024
@ofborg ofborg bot requested review from ConnorBaker and Ma27 December 28, 2024 22:10
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. and removed 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. labels Dec 28, 2024
@wentasah
Copy link
Contributor

wentasah commented Dec 29, 2024

Looks reasonable. Confirming that it fixes glibcInfo build.

jian-lin
jian-lin approved these changes Dec 29, 2024
View reviewed changes
Copy link
Contributor

@jian-lin jian-lin left a comment

Choose a reason for hiding this comment

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

related: #369004

This was referenced Dec 29, 2024
Merged
Merged
@Ma27
Copy link
Member

Ma27 commented Dec 29, 2024

Now that the other one is merged, I think this can be closed.

@Ma27 Ma27 closed this Dec 29, 2024
@jian-lin
Copy link
Contributor

jian-lin commented Dec 29, 2024

Now that the other one is merged, I think this can be closed.

These two PRs are related but somewhat orthogonal. That one only fix glibcInfo. This PR fixes makeFlags for glibc.

@jian-lin jian-lin reopened this Dec 29, 2024
@wolfgangwalther
Copy link
Contributor

wolfgangwalther commented Dec 29, 2024

Hm, I think this file is still in a broken state now. The change here still seems sensible to do.

wolfgangwalther
wolfgangwalther approved these changes Dec 29, 2024
View reviewed changes
Copy link
Contributor

@wolfgangwalther wolfgangwalther left a comment

Choose a reason for hiding this comment

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

Sorry for breaking it and thanks for fixing it. LGTM.

I also confirmed that I didn't break anything else with a similar pattern in that PR/commit. Don't think I did.

@wolfgangwalther
Copy link
Contributor

wolfgangwalther commented Dec 29, 2024

The commit message / PR title should be changed - no reference to glibcInfo required anymore after the other PR.

@mjoerg
glibc: avoid overriding makeFlags
7498f43 
fixes regression introduced in NixOS#357052
@mjoerg mjoerg force-pushed the glibc-fix-make-flags branch from 25a4144 to 7498f43 Compare December 29, 2024 18:41
@mjoerg mjoerg changed the title glibc{,Info}: avoid overriding makeFlags glibc: avoid overriding makeFlags Dec 29, 2024
@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. and removed 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels Dec 29, 2024
@ofborg ofborg bot added 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. and removed 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. labels Dec 30, 2024
@NixOS NixOS locked and limited conversation to collaborators Dec 30, 2024
@NixOS NixOS unlocked this conversation Dec 30, 2024
@Ma27
Copy link
Member

Ma27 commented Jan 2, 2025

These two PRs are related but somewhat orthogonal. That one only fix glibcInfo. This PR fixes makeFlags for glibc.

Apologies, you're absolutely right!

@Ma27 Ma27 merged commit 753f9a3 into NixOS:staging Jan 2, 2025
44 of 45 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Ma27 Ma27 Ma27 approved these changes

@wolfgangwalther wolfgangwalther wolfgangwalther approved these changes

@jian-lin jian-lin jian-lin approved these changes

@ConnorBaker ConnorBaker Awaiting requested review from ConnorBaker

Assignees

No one assigned

Labels

10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@mjoerg @wentasah @Ma27 @jian-lin @wolfgangwalther