public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make-bootstrap-tools-cross.nix: More syncs from the non-cross version

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-07-17 03:40:45 +03:00 committed by Tuomas Tynkkynen
parent 954e54f563
commit 5cbb6ac151
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
View File

@ -65,7 +65,6 @@ let
gnused = pkgs.gnused.crossDrv; gnused = pkgs.gnused.crossDrv;
gnugrep = pkgs.gnugrep.crossDrv; gnugrep = pkgs.gnugrep.crossDrv;
gawk = pkgs.gawk.crossDrv; gawk = pkgs.gawk.crossDrv;
gnutar = pkgs.gnutar.crossDrv;
gzip = pkgs.gzip.crossDrv; gzip = pkgs.gzip.crossDrv;
bzip2 = pkgs.bzip2.crossDrv; bzip2 = pkgs.bzip2.crossDrv;
gnumake = pkgs.gnumake.crossDrv; gnumake = pkgs.gnumake.crossDrv;
@ -85,6 +84,7 @@ in
rec { rec {
coreutilsMinimal = (pkgs.coreutils.override (args: { coreutilsMinimal = (pkgs.coreutils.override (args: {
# We want coreutils without ACL support. # We want coreutils without ACL support.
aclSupport = false; aclSupport = false;
@ -92,6 +92,8 @@ rec {
singleBinary = "symlinks"; singleBinary = "symlinks";
})).crossDrv; })).crossDrv;
tarMinimal = (pkgs.gnutar.override { acl = null; }).crossDrv;
busyboxMinimal = (pkgs.busybox.override { busyboxMinimal = (pkgs.busybox.override {
useMusl = true; useMusl = true;
enableStatic = true; enableStatic = true;
@ -107,17 +109,14 @@ rec {
''; '';
}).crossDrv; }).crossDrv;
inherit pkgs;
build = build =
stdenv.mkDerivation { stdenv.mkDerivation {
name = "build"; name = "stdenv-bootstrap-tools-cross";
crossConfig = stdenv.cross.config;
buildInputs = [nukeReferences cpio binutilsCross]; buildInputs = [nukeReferences cpio binutilsCross];
crossConfig = stdenv.cross.config;
buildCommand = '' buildCommand = ''
set -x set -x
mkdir -p $out/bin $out/lib $out/libexec mkdir -p $out/bin $out/lib $out/libexec
@ -137,7 +136,15 @@ rec {
cp -d ${glibc.out}/lib/crt?.o $out/lib cp -d ${glibc.out}/lib/crt?.o $out/lib
cp -rL ${glibc.dev}/include $out cp -rL ${glibc.dev}/include $out
chmod -R u+w $out/include chmod -R u+w "$out"
# glibc can contain linker scripts: find them, copy their deps,
# and get rid of absolute paths (nuke-refs would make them useless)
local lScripts=$(grep --files-with-matches --max-count=1 'GNU ld script' -R "$out/lib")
cp -d -t "$out/lib/" $(cat $lScripts | tr " " "\n" | grep -F '${glibc.out}' | sort -u)
for f in $lScripts; do
substituteInPlace "$f" --replace '${glibc.out}/lib/' ""
done
# Hopefully we won't need these. # Hopefully we won't need these.
rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video
@ -157,7 +164,7 @@ rec {
cp -d ${gnugrep}/bin/grep $out/bin cp -d ${gnugrep}/bin/grep $out/bin
cp ${gawk}/bin/gawk $out/bin cp ${gawk}/bin/gawk $out/bin
cp -d ${gawk}/bin/awk $out/bin cp -d ${gawk}/bin/awk $out/bin
cp ${gnutar}/bin/tar $out/bin cp ${tarMinimal}/bin/tar $out/bin
cp ${gzip}/bin/gzip $out/bin cp ${gzip}/bin/gzip $out/bin
cp ${bzip2.bin}/bin/bzip2 $out/bin cp ${bzip2.bin}/bin/bzip2 $out/bin
cp -d ${gnumake}/bin/* $out/bin cp -d ${gnumake}/bin/* $out/bin