diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-05-19 21:29:48 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-05-19 21:29:48 +0000 |
| commit | ee7ad85926641e0325445ee92479b14be443fe54 (patch) | |
| tree | a609c3e56a8a9e4c0e93b9c32f539d8c9414632e /pkgs/development | |
| parent | e5571e9cd4739543c0ce4d56affc90469dc749f0 (diff) | |
| download | nixpkgs-ee7ad85926641e0325445ee92479b14be443fe54.tar nixpkgs-ee7ad85926641e0325445ee92479b14be443fe54.tar.gz nixpkgs-ee7ad85926641e0325445ee92479b14be443fe54.tar.bz2 nixpkgs-ee7ad85926641e0325445ee92479b14be443fe54.tar.lz nixpkgs-ee7ad85926641e0325445ee92479b14be443fe54.tar.xz nixpkgs-ee7ad85926641e0325445ee92479b14be443fe54.tar.zst nixpkgs-ee7ad85926641e0325445ee92479b14be443fe54.zip | |
glibc/hurd: Add libhurduser and libmachuser to the libc.so linker script.
svn path=/nixpkgs/trunk/; revision=21901
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/glibc-2.11/builder2.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/development/libraries/glibc-2.11/builder2.sh b/pkgs/development/libraries/glibc-2.11/builder2.sh index f52573dbb08..f156e647e0b 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 |