From 0a2f531aeaad713baf9570e7bc86bfebc5a1503b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 17 Jun 2005 13:46:04 +0000
Subject: [PATCH] * Don't patch symlinked shared libraries.

svn path=/nixpkgs/trunk/; revision=3195
---
 pkgs/stdenv/generic/setup.sh            |  5 +++--
 pkgs/tools/compression/bzip2/builder.sh | 10 ----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 216205f4f76..eb78968702c 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -535,8 +535,9 @@ checkPhase() {
 
 patchELF() {
     # Patch all ELF executables and shared libraries.
-    header "patching ELF executables and libraries"
-    find "$prefix" \( -name "*.so*" -o \
+    header "patching ELF executables and libraries (BLA)"
+    find "$prefix" \( \
+        \( -type f -a -name "*.so*" \) -o \
         \( -type f -a -perm +0100 \) \
         \) -exec patchelf --shrink-rpath {} \;
     stopNest
diff --git a/pkgs/tools/compression/bzip2/builder.sh b/pkgs/tools/compression/bzip2/builder.sh
index 00deff9e2c0..c88724f2d21 100644
--- a/pkgs/tools/compression/bzip2/builder.sh
+++ b/pkgs/tools/compression/bzip2/builder.sh
@@ -6,16 +6,6 @@ preBuild() {
     make -f Makefile-libbz2_so
 }
 
-patchELF() {
-    # Patch all ELF executables and shared libraries.
-    header "patching ELF executables and libraries (BLA)"
-    find "$prefix" \( \
-        \( -type f -a -name "*.so*" \) -o \
-        \( -type f -a -perm +0100 \) \
-        \) -exec patchelf --shrink-rpath {} \;
-    stopNest
-}
-
 preInstall=preInstall
 preInstall() {
     ensureDir $out/lib