pyrox.dev
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
+2
-2
pkgs/stdenv/linux/bootstrap/armv5tel/default.nix
+2
-2
pkgs/stdenv/linux/bootstrap/armv5tel/default.nix
···
7
7
curl = ./curl.bz2;
8
8
9
9
bootstrapTools = {
10
-
url = "http://nixos.org/tarballs/stdenv-linux/armv5tel/r17267/bootstrap-tools.cpio.bz2";
11
-
sha256 = "0b7mrcl7naj1xpqx1qnlmd825dxzikzhxir3mw4pr3dy28n0b2ka";
10
+
url = "http://vicerveza.homeunix.net/~viric/tmp/bootstrap-tools.cpio.bz2";
11
+
sha256 = "1rn4n5kilqmv62dfjfcscbsm0w329k3gyb2v9155fsi1sl2cfzcb";
12
12
};
13
13
}
+4
-4
pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh
+4
-4
pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh
···
12
12
# use a copy of patchelf.
13
13
LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? $out/bin/cp $out/bin/patchelf .
14
14
15
-
for i in $out/bin/* $out/libexec/gcc/*/*/*; do
15
+
for i in $out/bin/* $out/libexec/gcc/*/*/* $out/lib/librt*; do
16
16
echo patching $i
17
17
if ! test -L $i; then
18
18
LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? \
···
21
21
$out/bin/patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib --force-rpath $i
22
22
fi
23
23
done
24
-
for i in $out/lib/librt* ; do
24
+
for i in $out/lib/libppl* $out/lib/libgmp*; do
25
25
echo patching $i
26
26
if ! test -L $i; then
27
27
LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? \
28
-
$out/bin/patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib --force-rpath $i
28
+
$out/bin/patchelf --set-rpath $out/lib --force-rpath $i
29
29
LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? \
30
-
$out/bin/patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib --force-rpath $i
30
+
$out/bin/patchelf --set-rpath $out/lib --force-rpath $i
31
31
fi
32
32
done
33
33