diff options
| author | Peter Simons <simons@cryp.to> | 2012-04-02 14:15:01 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-04-02 14:15:01 +0000 |
| commit | 342559e0a1ef81ca1df1c2230095468069ddef93 (patch) | |
| tree | 079f17bb4e1d6d335c99d903a77bd161fc1ee727 /pkgs/development/libraries/glibc | |
| parent | 29b034158971a9bbac6d776b839966486c876358 (diff) | |
| download | nixlib-342559e0a1ef81ca1df1c2230095468069ddef93.tar nixlib-342559e0a1ef81ca1df1c2230095468069ddef93.tar.gz nixlib-342559e0a1ef81ca1df1c2230095468069ddef93.tar.bz2 nixlib-342559e0a1ef81ca1df1c2230095468069ddef93.tar.lz nixlib-342559e0a1ef81ca1df1c2230095468069ddef93.tar.xz nixlib-342559e0a1ef81ca1df1c2230095468069ddef93.tar.zst nixlib-342559e0a1ef81ca1df1c2230095468069ddef93.zip | |
glibc: Fixed gencat and librt impurities.
Patch submitted by Jack Cummings <jack@mudshark.org> to the nix-dev mailing list in message <20120309092909.GG39859@ice9.mudshark.org>. svn path=/nixpkgs/branches/stdenv-updates/; revision=33536
Diffstat (limited to 'pkgs/development/libraries/glibc')
| -rw-r--r-- | pkgs/development/libraries/glibc/2.13/builder.sh | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/glibc/2.14/builder.sh | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/development/libraries/glibc/2.13/builder.sh b/pkgs/development/libraries/glibc/2.13/builder.sh index 9a1c1490019a..f979b91200d2 100644 --- a/pkgs/development/libraries/glibc/2.13/builder.sh +++ b/pkgs/development/libraries/glibc/2.13/builder.sh @@ -51,5 +51,11 @@ postInstall() { rm -f $out/lib/libgcc_s.so.1 } +postFixup() { + # libelf uses gencat, so we need to fix it's rpath so that it doesn't pick up the system rpath. + patchelf --set-rpath $out/lib $out/bin/gencat + # librt (used by acl, used by coreutils) links against pthread, try *not* to pick up the system one. + patchelf --set-rpath $out/lib $out/lib/librt-*.so +} genericBuild diff --git a/pkgs/development/libraries/glibc/2.14/builder.sh b/pkgs/development/libraries/glibc/2.14/builder.sh index 9a1c1490019a..7d829816fb7b 100644 --- a/pkgs/development/libraries/glibc/2.14/builder.sh +++ b/pkgs/development/libraries/glibc/2.14/builder.sh @@ -51,5 +51,12 @@ postInstall() { rm -f $out/lib/libgcc_s.so.1 } +postFixup() { + # libelf uses gencat, so we need to fix it's rpath so that it doesn't pick up the system rpath. + patchelf --set-rpath $out/lib $out/bin/gencat + # librt (used by acl, used by coreutils) links against pthread, try *not* to pick up the system one. + patchelf --set-rpath $out/lib $out/lib/librt-*.so +} + genericBuild |