* 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.

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
 	}