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

* Updated the function that builds the bootstrap binaries.

Browse Source 
* Use patchelf 0.5 and use the --force-rpath flag.  This removes the
  need for setting LD_LIBRARY_PATH and so should fix bootstrapping
  Nixpkgs on non-NixOS platforms.

svn path=/nixpkgs/trunk/; revision=16022
This commit is contained in:
Eelco Dolstra 2009-06-22 14:28:07 +00:00
parent a40dbf619d
commit ef83c754f6
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,14 +6,11 @@ rec {
# We want coreutils without ACL support. # We want coreutils without ACL support.
coreutils_ = coreutils.function (args: { coreutils_ = coreutils.override (args: {
aclSupport = false; aclSupport = false;
}); });
gcc = gcc43;
curlDiet = import ../../tools/networking/curl { curlDiet = import ../../tools/networking/curl {
inherit fetchurl; inherit fetchurl;
stdenv = useDietLibC stdenv; stdenv = useDietLibC stdenv;
@ -55,6 +52,8 @@ rec {
# 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
find $out/include -name .install -exec rm {} \;
find $out/include -name ..install.cmd -exec rm {} \;
mv $out/include $out/include-glibc mv $out/include $out/include-glibc
# Copy coreutils, bash, etc. # Copy coreutils, bash, etc.
@ -74,7 +73,7 @@ rec {
cp ${bzip2}/bin/bzip2 $out/bin cp ${bzip2}/bin/bzip2 $out/bin
cp -d ${gnumake}/bin/* $out/bin cp -d ${gnumake}/bin/* $out/bin
cp -d ${patch}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin
cp ${patchelf}/bin/* $out/bin cp ${patchelf05}/bin/* $out/bin
cp ${replace}/bin/* $out/bin cp ${replace}/bin/* $out/bin
cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep
@ -90,6 +89,7 @@ rec {
rm -f $out/lib/gcc/*/*/include*/linux rm -f $out/lib/gcc/*/*/include*/linux
rm -f $out/lib/gcc/*/*/include*/sound rm -f $out/lib/gcc/*/*/include*/sound
rm -rf $out/lib/gcc/*/*/include*/root rm -rf $out/lib/gcc/*/*/include*/root
rm -f $out/lib/gcc/*/*/include-fixed/asm
#rm -f $out/lib/gcc/*/*/*.a #rm -f $out/lib/gcc/*/*/*.a
cp -rd ${gcc.gcc}/libexec/* $out/libexec cp -rd ${gcc.gcc}/libexec/* $out/libexec
mkdir $out/include mkdir $out/include
@ -160,7 +160,7 @@ rec {
echo patching $i echo patching $i
if ! test -L $i; then if ! test -L $i; then
LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.2 \ LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.2 \
$out/bin/patchelf --set-interpreter $out/lib/ld-linux*.so.2 --set-rpath $out/lib $i $out/bin/patchelf --set-interpreter $out/lib/ld-linux*.so.2 --set-rpath $out/lib --force-rpath $i
fi fi
done done
@ -180,8 +180,6 @@ rec {
stdenv.mkDerivation { stdenv.mkDerivation {
name = "test"; name = "test";
LD_LIBRARY_PATH = "${unpack}/lib";
realBuilder = "${unpack}/bin/bash"; realBuilder = "${unpack}/bin/bash";
buildCommand = '' buildCommand = ''