From a2b2e6542ff521ba46f2026dfcc4afe80fe3b490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 8 Dec 2009 10:03:20 +0000
Subject: [PATCH] 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
---
 pkgs/stdenv/linux/bootstrap/armv5tel/default.nix        | 4 ++--
 pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix b/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix
index 583e384fdf4..c529346aaf1 100644
--- a/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix
@@ -7,7 +7,7 @@
   curl = ./curl.bz2;
 
   bootstrapTools = {
-    url = "http://nixos.org/tarballs/stdenv-linux/armv5tel/r17267/bootstrap-tools.cpio.bz2";
-    sha256 = "0b7mrcl7naj1xpqx1qnlmd825dxzikzhxir3mw4pr3dy28n0b2ka";
+    url = "http://vicerveza.homeunix.net/~viric/tmp/bootstrap-tools.cpio.bz2";
+    sha256 = "1rn4n5kilqmv62dfjfcscbsm0w329k3gyb2v9155fsi1sl2cfzcb";
   };
 }
diff --git a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh
index 2399e48b026..3709ac05041 100644
--- a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh
+++ b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh
@@ -12,7 +12,7 @@ echo Patching the bootstrap tools...
 # use a copy of 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
     if ! test -L $i; then
          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
     fi
 done
-for i in $out/lib/librt* ; do
+for i in $out/lib/libppl* $out/lib/libgmp*; do
     echo patching $i
     if ! test -L $i; then
          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.? \
-             $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
 done