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

matthewbauer commented May 9, 2020

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
@matthewbauer matthewbauer changed the base branch from master to staging May 9, 2020
@FRidh FRidh changed the base branch from staging to staging-next May 11, 2020
@FRidh FRidh changed the base branch from staging-next to staging May 11, 2020
@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;

This comment has been minimized.

Copy link
@jtojnar

jtojnar May 12, 2020

Contributor

Why not remove this?

This comment has been minimized.

Copy link
@matthewbauer

matthewbauer May 12, 2020

Author Member

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

This comment has been minimized.

Copy link
@jtojnar

jtojnar May 12, 2020

Contributor

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

This comment has been minimized.

Copy link
@matthewbauer

matthewbauer May 12, 2020

Author Member

right that would be a no-op

Stripping reduces closure sizes.
@matthewbauer matthewbauer merged commit 01377fc into NixOS:staging May 30, 2020
14 checks passed
14 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="34aff7f"; rev="34aff7f6973743a5e6e672c01016c4280d471453"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="34aff7f"; rev="34aff7f6973743a5e6e672c01016c4280d471453"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="34aff7f"; rev="34aff7f6973743a5e6e672c01016c4280d471453"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="34aff7f"; rev="34aff7f6973743a5e6e672c01016c4280d471453"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="34aff7f"; rev="34aff7f6973743a5e6e672c01016c4280d471453"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="34aff7f"; rev="34aff7f6973743a5e6e672c01016c4280d471453"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="34aff7f"; rev="34aff7f6973743a5e6e672c01016c4280d471453"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
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
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.