From d8b083497304ba58e8921a0a54e704d90be026b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 30 Dec 2012 13:53:48 +0000 Subject: [PATCH] unpack-bootstrap-tools: Removing the patch of libstdc++ Although patching it made some programs run (configure tests), some others crashed with segfault. So I don't think there is any win patching it. The proper way to solve the bootstrap in the raspberry pi is, as far as I've been testing, use glibc 2.17 libs in bootstrap-tools with the same ld.so name as the bootstrapped glibc. This is a problem inherent in our way to bootstrap, that first replaces the glibc of a given gcc+glibc (bootstrap-tools) with gcc-wrapper tricks, and then builds a new gcc. A nicer way would be to build a gcc without glibc, then the glibc, then the final gcc, as we do with cross-tools. Some comments about this problem in https://github.com/NixOS/nixpkgs/issues/234#issuecomment-11764352 --- pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh index afa949c5deb..dcf819ad6f7 100644 --- a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh +++ b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh @@ -23,8 +23,7 @@ for i in $out/bin/* $out/libexec/gcc/*/*/* $out/lib/librt*; do 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 done -for i in $out/lib/librt* $out/lib/libcloog* $out/lib/libppl* $out/lib/libgmp* \ - $out/lib/libstdc++*.so*[0-9]; do +for i in $out/lib/librt* $out/lib/libcloog* $out/lib/libppl* $out/lib/libgmp*; do if ! test -f $i; then continue; fi if test -L $i; then continue; fi echo patching $i