Author: shlevy
Date: Wed Apr 6 14:33:44 2011
New Revision: 26717
URL: https://svn.nixos.org/websvn/nix/?rev=26717&sc=1
Log:
Put the right libraries into the bootstrap, bootstrap based on a bootstrap
built from stdenv rather than one from gnatboot
Modified:
nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/make-bootstrap-tools.nix
nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh
Modified:
nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
Wed Apr 6 14:33:35 2011 (r26716)
+++ nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
Wed Apr 6 14:33:44 2011 (r26717)
@@ -4,7 +4,7 @@
{
bootstrapTools = {
- url = http://www.shealevy.com/bootstrap-tools.cpio.bz2;
- sha256 = "18qg8xanrzprhy9z7z499pgwifsnrpz6shh230rbf3zg8cfgjj2x";
+ url = http://www.shealevy.com/nix/1/bootstrap-tools.cpio.bz2;
+ sha256 = "0qvmz48ba10g0q5fl3rgqpf3yfzr13aflk08f1hxdb2hqbf164dj";
};
}
Modified: nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/make-bootstrap-tools.nix
==============================================================================
--- nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/make-bootstrap-tools.nix
Wed Apr 6 14:33:35 2011 (r26716)
+++ nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/make-bootstrap-tools.nix
Wed Apr 6 14:33:44 2011 (r26717)
@@ -161,8 +161,8 @@
cp -d ${gmpxx}/lib/libgmp*.so* $out/lib
cp -d ${mpfr}/lib/libmpfr*.so* $out/lib
- cp -d ${ppl}/lib/libppl*.so* $out/lib
- cp -d ${cloogppl}/lib/libcloog*.so* $out/lib
+ cp -d ${ppl0_11}/lib/libppl*.so* $out/lib
+ cp -d ${cloog}/lib/libcloog*.so* $out/lib
cp -d ${mpc}/lib/libmpc*.so* $out/lib
cp -d ${zlib}/lib/libz.so* $out/lib
cp -d ${libelf}/lib/libelf.so* $out/lib
@@ -223,6 +223,7 @@
${build}/in-nixpkgs/mkdir $out
${build}/in-nixpkgs/bzip2 -d <
${build}/on-server/bootstrap-tools.cpio.bz2 | (cd $out &&
${build}/in-nixpkgs/cpio -v -i)
+ set +e
for i in $out/bin/* $out/libexec/gcc/*/*/*; do
echo patching $i
if ! test -L $i; then
@@ -230,6 +231,7 @@
$out/bin/patchelf --set-interpreter
$out/lib/ld-linux*.so.2 --set-rpath $out/lib --force-rpath $i
fi
done
+ set -e
# Fix the libc linker script.
for i in $out/lib/libc.so; do
Modified:
nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh
==============================================================================
---
nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh
Wed Apr 6 14:33:35 2011 (r26716)
+++
nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh
Wed Apr 6 14:33:44 2011 (r26717)
@@ -20,6 +20,7 @@
# use a copy of patchelf.
LD_LIBRARY_PATH=$out/lib $LD_BINARY $out/bin/cp $out/bin/patchelf .
+set +e
for i in $out/bin/* $out/libexec/gcc/*/*/*; do
echo patching $i
if ! test -L $i; then
@@ -29,6 +30,7 @@
$out/bin/patchelf --set-interpreter $LD_BINARY --set-rpath
$out/lib --force-rpath $i
fi
done
+set -e
for i in $out/lib/librt* ; do
echo patching $i
if ! test -L $i; then
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
