Skip to content

libc: wipe out all references from copied libgcc_s.so.1#210741

Merged
trofi merged 1 commit intoNixOS:stagingfrom
trofi:glibc-wipe-libgcc_s.so.1-ref
Jan 15, 2023
Merged

libc: wipe out all references from copied libgcc_s.so.1#210741
trofi merged 1 commit intoNixOS:stagingfrom
trofi:glibc-wipe-libgcc_s.so.1-ref

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Jan 14, 2023 •
edited
Loading

Without the change a copy from freshly built gcc still retains a reference even after patchelf --remove-rpath because patchelf does not cleanup dynamic sprintgs section.

The change stubs the reference out and fixes build on bootstraps where gcc is built before glibc.

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@trofi
libc: wipe out all references from copied libgcc_s.so.1
6728277 
Without the change a copy from freshly built `gcc` still retains a
reference even after `patchelf --remove-rpath` because `patchelf` does
not cleanup dynamic sprintgs section.

The change stubs the reference out and fixes build on bootstraps where
`gcc` is built before `glibc`.
@trofi trofi mentioned this pull request Jan 14, 2023
Closed
13 tasks
@ofborg ofborg bot added the 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. label Jan 14, 2023
@ofborg ofborg bot requested review from Ma27 and edolstra January 14, 2023 20:41
@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. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jan 14, 2023
@trofi trofi merged commit 3a3b623 into NixOS:staging Jan 15, 2023
@trofi trofi deleted the glibc-wipe-libgcc_s.so.1-ref branch January 15, 2023 06:34
@trofi trofi mentioned this pull request Jan 15, 2023
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Ma27 Ma27 Awaiting requested review from Ma27

@edolstra edolstra Awaiting requested review from edolstra

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.

1 participant

@trofi