JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Don't patch symlinked shared libraries.

Browse Source 
svn path=/nixpkgs/trunk/; revision=3195
This commit is contained in:
Eelco Dolstra 2005-06-17 13:46:04 +00:00
parent 98761b883a
commit 0a2f531aea
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/stdenv/generic/setup.sh
View File

@ -535,8 +535,9 @@ checkPhase() {
patchELF() { patchELF() {
# Patch all ELF executables and shared libraries. # Patch all ELF executables and shared libraries.
header "patching ELF executables and libraries" header "patching ELF executables and libraries (BLA)"
find "$prefix" \( -name "*.so*" -o \ find "$prefix" \( \
\( -type f -a -name "*.so*" \) -o \
\( -type f -a -perm +0100 \) \ \( -type f -a -perm +0100 \) \
\) -exec patchelf --shrink-rpath {} \; \) -exec patchelf --shrink-rpath {} \;
stopNest stopNest

10
pkgs/tools/compression/bzip2/builder.sh
View File

@ -6,16 +6,6 @@ preBuild() {
make -f Makefile-libbz2_so 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=preInstall
preInstall() { preInstall() {
ensureDir $out/lib ensureDir $out/lib