diff options
| -rwxr-xr-x | find-provides.in | 2 | ||||
| -rwxr-xr-x | find-requires.in | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/find-provides.in b/find-provides.in index 428896c..8f32dad 100755 --- a/find-provides.in +++ b/find-provides.in @@ -5,7 +5,7 @@ filelist=`sed "s/['\"]/\\\&/g"` -solist=$(echo "$filelist" | grep -v "^/lib/ld\.so" | egrep '(/usr(/X11R6)?)?/lib(64)?/[^/]+\.so' | \ +solist=$(echo "$filelist" | grep -v "^/lib/ld\.so" | egrep '(/usr(/X11R6)?)?/lib(64)?/.*\.so' | \ xargs file -L 2>/dev/null | grep "ELF.*shared object" | cut -d: -f1) pythonlist= tcllist= 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 } |