aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-04-03 13:09:11 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-04-03 13:09:11 +0000
commit44a4d034bd0e3c91da1232ce8f5f3527c9c574fa (patch)
treef1da44ee151ea5c6d9ffc9b32443a74730bd47b7
parentbf396f8c519268844de6ecfac8c374fc70b75606 (diff)
downloadrpm-setup-44a4d034bd0e3c91da1232ce8f5f3527c9c574fa.tar
rpm-setup-44a4d034bd0e3c91da1232ce8f5f3527c9c574fa.tar.gz
rpm-setup-44a4d034bd0e3c91da1232ce8f5f3527c9c574fa.tar.bz2
rpm-setup-44a4d034bd0e3c91da1232ce8f5f3527c9c574fa.tar.xz
rpm-setup-44a4d034bd0e3c91da1232ce8f5f3527c9c574fa.zip
* Require only .so that are in standard paths
* Use ldd instead of objdump to get the list of required .so. This enables to get the so paths.
-rwxr-xr-xfind-requires.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/find-requires.in b/find-requires.in
index 7c21bf7..0460efa 100755
--- a/find-requires.in
+++ b/find-requires.in
@@ -9,7 +9,7 @@ ulimit -c 0
#
# --- Set needed to 0 for traditional find-requires behavior.
-needed=1
+needed=0
if [ X"$1" = Xldd ]; then
needed=0
elif [ X"$1" = Xobjdump ]; then
@@ -69,7 +69,7 @@ if [ "$needed" -eq 0 ]; then
lib64=`if file -L $f 2>/dev/null | \
grep "ELF 64-bit" >/dev/null; then echo "$mark64"; fi`
ldd $f | awk '/=>/ {
- if ($1 !~ /libNoVersion.so/ && $1 !~ /4[um]lib.so/ && $1 !~ /libredhat-kernel.so/) {
+ if ($1 !~ /libNoVersion.so/ && $1 !~ /4[um]lib.so/ && $3 ~ /(\/usr(\/X11R6)?)?\/lib(|64)\/[^\/]+\.so/) {
gsub(/'\''"/,"\\&",$1);
printf "%s'$lib64'\n", $1
}
@@ -83,7 +83,7 @@ if [ "$needed" -eq 0 ]; then
lib64=`if file -L $f 2>/dev/null | \
grep "ELF 64-bit" >/dev/null; then echo "$mark64"; fi`
ldd $f | awk '/=>/ {
- if ($1 !~ /libNoVersion.so/ && $1 !~ /4[um]lib.so/ && $1 !~ /libredhat-kernel.so/) {
+ if ($1 !~ /libNoVersion.so/ && $1 !~ /4[um]lib.so/ && $3 ~ /(\/usr(\/X11R6)?)?\/lib(|64)\/[^\/]+\.so/) {
gsub(/'\''"/,"\\&",$1);
printf "%s'$lib64'\n", $1
}