Skip to content

perl: add cc in addition to makeBinaryWrapper#320466

Merged
Ericson2314 merged 1 commit intoNixOS:stagingfrom
rhelmot:freebsd-perl-env
Aug 15, 2024
Merged

perl: add cc in addition to makeBinaryWrapper#320466
Ericson2314 merged 1 commit intoNixOS:stagingfrom
rhelmot:freebsd-perl-env

Conversation

@rhelmot
Copy link
Contributor

@rhelmot rhelmot commented Jun 17, 2024

Description of changes

see #311794

The "correct" solution to this problem (makeBinaryWrapper fails to be able to compile the binary wrapper when building a freebsd cross env) is that makeBinaryWrapper should propagate or embed a reference to the compiler. However, this causes build failures on musl, so this will have to do for now.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
    • x86_64-freebsd (native and cross)
  • 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.

@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 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: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Jun 17, 2024
@Ericson2314
Copy link
Member

Can you add some sort of "TODO: remove..." in the code? In #311794 I left a comment saying I think I know how to fix hardening issue on the "proper" fix.

The "correct" solution to this problem (makeBinaryWrapper fails to be
able to compile the binary wrapper when building a freebsd cross env) is
that makeBinaryWrapper should propagate or embed a reference to the
compiler. However, this causes build failures on musl, so this will have
to do for now.
@rhelmot rhelmot force-pushed the freebsd-perl-env branch from 85a5434 to f293272 Compare July 24, 2024 19:40
@rhelmot
Copy link
Contributor Author

rhelmot commented Jul 24, 2024

done

Copy link
Contributor

@marcusramberg marcusramberg left a comment

Choose a reason for hiding this comment

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

lgtm

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Aug 10, 2024
@Ericson2314 Ericson2314 merged commit c4a733d into NixOS:staging Aug 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants