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.

Sign up for GitHub

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

perl-cross: fix . being included in INC #98466

Merged
merged 1 commit into from Sep 22, 2020
Merged

perl-cross: fix . being included in INC #98466

merged 1 commit into from Sep 22, 2020

Conversation

stigtsp
Copy link
Member

@stigtsp stigtsp commented Sep 22, 2020 •
edited

Perl build with perl-cross had . in @INC. This sets -Ddefault_inc_excludes_dot explicitly when cross compiling to avoid that.

$ $(nix-build -A pkgsCross.aarch64-multiplatform.perl)/bin/perl -V | grep -A10 \@INC
  @INC:
    /nix/store/ydwsg1alzk104qpvv7ayrkkbj1b7hyib-perl-5.32.0-aarch64-unknown-linux-gnu/lib/perl5/site_perl/5.32.0/aarch64-linux
    /nix/store/ydwsg1alzk104qpvv7ayrkkbj1b7hyib-perl-5.32.0-aarch64-unknown-linux-gnu/lib/perl5/site_perl/5.32.0
    /nix/store/ydwsg1alzk104qpvv7ayrkkbj1b7hyib-perl-5.32.0-aarch64-unknown-linux-gnu/lib/perl5/5.32.0/aarch64-linux
    /nix/store/ydwsg1alzk104qpvv7ayrkkbj1b7hyib-perl-5.32.0-aarch64-unknown-linux-gnu/lib/perl5/5.32.0
    .

This behaviour can be unsafe:
https://wiki.gentoo.org/wiki/Project:Perl/Dot-In-INC-Removal
https://metacpan.org/pod/release/XSAWYERX/perl-5.26.0-RC2/pod/perldelta.pod#Configuration-and-Compilation

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.

@stigtsp
perl-cross: fix . being included in INC
e292657 
perl-cross set `default_inc_excludes_dot` to undefined by default. This
sets `-Ddefault_inc_excludes_dot` explicitly when cross compiling.
@stigtsp
Copy link
Member Author

stigtsp commented Sep 22, 2020

@GrahamcOfBorg build pkgsCross.aarch64-multiplatform.perldevel
@GrahamcOfBorg build pkgsCross.aarch64-multiplatform.perl
@GrahamcOfBorg build pkgsCross.armv7l-hf-multiplatform.perldevel
@GrahamcOfBorg build pkgsCross.armv7l-hf-multiplatform.perl

@stigtsp stigtsp mentioned this pull request Sep 22, 2020
Closed
@stigtsp
Copy link
Member Author

stigtsp commented Sep 22, 2020

This was quickly fixed upstream arsv/perl-cross@f59d2b6 ❤️

Will keep the current patch in place so it can be backported to 20.09 and 20.03 without bumping perl-cross

@Ericson2314
Copy link
Member

So this is making cross perl match native perl?

@stigtsp
Copy link
Member Author

stigtsp commented Sep 22, 2020

So this is making cross perl match native perl?

Yes that's correct.

@Ericson2314 Ericson2314 merged commit 3e462a8 into NixOS:master Sep 22, 2020
@stigtsp stigtsp mentioned this pull request Sep 22, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ericson2314 Ericson2314 Ericson2314 approved these changes

@lopsided98 lopsided98 Awaiting requested review from lopsided98

@aanderse aanderse Awaiting requested review from aanderse

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@stigtsp @Ericson2314