From 5f21c24c28a338b83f9ebf8234f0d65b817b1dd8 Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Wed, 10 May 2006 09:19:54 +0000 Subject: Revert recent changes to computation of provides/requires w.r.t .so files that are not in standard paths. --- find-requires.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'find-requires.in') diff --git a/find-requires.in b/find-requires.in index 0460efa..41369a0 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=0 +needed=1 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/ && $3 ~ /(\/usr(\/X11R6)?)?\/lib(|64)\/[^\/]+\.so/) { + if ($1 !~ /libNoVersion.so/ && $1 !~ /4[um]lib.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/ && $3 ~ /(\/usr(\/X11R6)?)?\/lib(|64)\/[^\/]+\.so/) { + if ($1 !~ /libNoVersion.so/ && $1 !~ /4[um]lib.so/) { gsub(/'\''"/,"\\&",$1); printf "%s'$lib64'\n", $1 } -- cgit v1.2.1