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

treewide: strip more things in cross #87435

Merged
merged 1 commit into from May 30, 2020

Conversation

matthewbauer
Copy link
Member

Stripping reduces closure sizes. This removes some old places where stripping was disabled.

Touches these packages:

  • perl
  • libpcap
  • readline{...}
  • libtool2
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.

@ofborg ofborg bot requested review from dtzWill and fpletz May 9, 2020 21:58
@matthewbauer matthewbauer changed the base branch from master to staging May 9, 2020 22:11
@FRidh FRidh changed the base branch from staging to staging-next May 11, 2020 20:20
@FRidh FRidh changed the base branch from staging-next to staging May 11, 2020 20:20
@FRidh FRidh added this to WIP in Staging via automation May 11, 2020
@FRidh FRidh moved this from WIP to Needs review in Staging May 11, 2020
# Don't run the native `strip' when cross-compiling. This breaks at least
# with `.a' files for MinGW.
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
dontStrip = false;
Copy link
Contributor

Choose a reason for hiding this comment

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

Why not remove this?

Copy link
Member Author

Choose a reason for hiding this comment

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

originally it was to avoid a mass rebuild, but given this is a mass rebuild anyway, removing it makes sense.

@@ -159,6 +159,8 @@ let
# into $dev/lib/perl5/cross_perl/${version}.
wrapProgram $dev/bin/perl --prefix PERL5LIB : \
"$dev/lib/perl5/cross_perl/${version}:$out/lib/perl5/${version}:$out/lib/perl5/${version}/$runtimeArch"

$STRIP $dev/bin/perl
Copy link
Contributor

@jtojnar jtojnar May 12, 2020

Choose a reason for hiding this comment

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

Why is not this stripped automatically? Also is not this a wrapper?

Copy link
Member Author

Choose a reason for hiding this comment

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

right that would be a no-op

Stripping reduces closure sizes.
@matthewbauer matthewbauer merged commit 01377fc into NixOS:staging May 30, 2020
Staging automation moved this from Needs review to Done May 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Staging
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

2 participants