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

New bootstrap-tools for armv5tel, with binutils and gcc-4.4. Without these binutils, 

we can't build easily with them gcc-4.4 natively, because of a bug in the ld of the
previous bootstrap-tools.
I updated the unpack script to include the new gcc-4.4 libraries *ppl*.so in patchelfing.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18835
This commit is contained in:
Lluís Batlle i Rossell 2009-12-08 10:03:20 +00:00
parent d0ae140f69
commit a2b2e6542f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/stdenv/linux/bootstrap/armv5tel/default.nix
View File

@ -7,7 +7,7 @@
curl = ./curl.bz2; curl = ./curl.bz2;
bootstrapTools = { bootstrapTools = {
url = "http://nixos.org/tarballs/stdenv-linux/armv5tel/r17267/bootstrap-tools.cpio.bz2"; url = "http://vicerveza.homeunix.net/~viric/tmp/bootstrap-tools.cpio.bz2";
sha256 = "0b7mrcl7naj1xpqx1qnlmd825dxzikzhxir3mw4pr3dy28n0b2ka"; sha256 = "1rn4n5kilqmv62dfjfcscbsm0w329k3gyb2v9155fsi1sl2cfzcb";
}; };
} }

8
pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh
View File

@ -12,7 +12,7 @@ echo Patching the bootstrap tools...
# use a copy of patchelf. # use a copy of patchelf.
LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? $out/bin/cp $out/bin/patchelf . LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? $out/bin/cp $out/bin/patchelf .
for i in $out/bin/* $out/libexec/gcc/*/*/*; do for i in $out/bin/* $out/libexec/gcc/*/*/* $out/lib/librt*; do
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.? \ LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? \
@ -21,13 +21,13 @@ for i in $out/bin/* $out/libexec/gcc/*/*/*; do
$out/bin/patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib --force-rpath $i $out/bin/patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib --force-rpath $i
fi fi
done done
for i in $out/lib/librt* ; do for i in $out/lib/libppl* $out/lib/libgmp*; do
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.? \ LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? \
$out/bin/patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib --force-rpath $i $out/bin/patchelf --set-rpath $out/lib --force-rpath $i
LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? \ LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? \
$out/bin/patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib --force-rpath $i $out/bin/patchelf --set-rpath $out/lib --force-rpath $i
fi fi
done done