From ee7ad85926641e0325445ee92479b14be443fe54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 19 May 2010 21:29:48 +0000 Subject: [PATCH] glibc/hurd: Add libhurduser and libmachuser to the libc.so linker script. svn path=/nixpkgs/trunk/; revision=21901 --- pkgs/development/libraries/glibc-2.11/builder2.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/glibc-2.11/builder2.sh b/pkgs/development/libraries/glibc-2.11/builder2.sh index f52573dbb080..f156e647e0b4 100644 --- a/pkgs/development/libraries/glibc-2.11/builder2.sh +++ b/pkgs/development/libraries/glibc-2.11/builder2.sh @@ -34,6 +34,15 @@ postInstall() { ln -sv $(ls -d $kernelHeaders/include/* | grep -v 'scsi$') .) fi + if test -f "$out/lib/libhurduser.so"; then + # libc.so, libhurduser.so, and libmachuser.so depend on each + # other, so add them to libc.so (a RUNPATH on libc.so.0.3 + # would be ignored by the cross-linker.) + echo "adding \`libhurduser.so' and \`libmachuser.so' to the \`libc.so' linker script..." + sed -i "$out/lib/libc.so" \ + -e"s|\(libc\.so\.[^ ]\+\>\)|\1 $out/lib/libhurduser.so $out/lib/libmachuser.so|g" + fi + # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink # "lib64" to "lib". if test -n "$is64bit"; then