From owner-svn-src-head@FreeBSD.ORG  Thu Apr  9 22:16:36 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7B05B961;
 Thu,  9 Apr 2015 22:16:36 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4CF625F4;
 Thu,  9 Apr 2015 22:16:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t39MGarS064040;
 Thu, 9 Apr 2015 22:16:36 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t39MGaS4064039;
 Thu, 9 Apr 2015 22:16:36 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201504092216.t39MGaS4064039@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 9 Apr 2015 22:16:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r281343 - head/tools/build
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Apr 2015 22:16:36 -0000

Author: bdrewery
Date: Thu Apr  9 22:16:35 2015
New Revision: 281343
URL: https://svnweb.freebsd.org/changeset/base/281343

Log:
  - Fix support with new elftoolchain readelf(1)
  - Fix not finding global symbols by checking for D and R.
  - Follow symlinks
  - Show which matching symbol was used to consider the library needed.
  
  Discussed with:	bapt

Modified:
  head/tools/build/check-links.sh

Modified: head/tools/build/check-links.sh
==============================================================================
--- head/tools/build/check-links.sh	Thu Apr  9 22:13:27 2015	(r281342)
+++ head/tools/build/check-links.sh	Thu Apr  9 22:16:35 2015	(r281343)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $FreeBSD$
 
-mime=$(file --mime-type $1)
+mime=$(file -L --mime-type $1)
 case $mime in
 *application/x-executable);;
 *application/x-sharedlib);;
@@ -10,16 +10,17 @@ esac
 
 # Check for useful libs
 list_libs=""
-for lib in $(readelf -d $1 | awk '$2 == "(NEEDED)" { sub(/\[/,"",$NF); sub(/\]/,"",$NF); print $NF }'); do
+for lib in $(readelf -d $1 | awk '$2 ~ /\(?NEEDED\)?/ { sub(/\[/,"",$NF); sub(/\]/,"",$NF); print $NF }'); do
         echo -n "checking if $lib is needed: "
         libpath=$(ldd $1 | awk -v lib=$lib '$1 == lib { print $3 }')
         list_libs="$list_libs $libpath"
         foundone=0
-        for fct in $(nm -D $libpath | awk '$2 == "T" || $2 == "W" || $2 == "B" { print $3 }'); do
+        for fct in $(nm -D $libpath | awk '$2 == "R" || $2 == "D" || $2 == "T" || $2 == "W" || $2 == "B" { print $3 }'); do
                 nm -D $1 | awk -v s=$fct '$1 == "U" && $2 == s { found=1 ; exit } END { if (found != 1) { exit 1 } }' && foundone=1 && break
         done
         if [ $foundone -eq 1 ]; then
-                echo "yes"
+                echo -n "yes... "
+                nm -D $1 | awk -v s=$fct '$1 == "U" && $2 == s { print $2 ; exit }'
         else
                 echo "no"
         fi
@@ -28,10 +29,9 @@ done
 for sym in $(nm -D $1 | awk '$1 == "U" { print $2 }'); do
         found=0
         for l in ${list_libs} ; do
-                nm -D $l | awk -v s=$sym '($2 == "T" || $2 == "W" || $2 == "B") && $3 == s { found=1 ; exit } END { if (found != 1) { exit 1 } }' && found=1 && break
+                nm -D $l | awk -v s=$sym '($2 == "R" || $2 == "D" || $2 == "T" || $2 == "W" || $2 == "B") && $3 == s { found=1 ; exit } END { if (found != 1) { exit 1 } }' && found=1 && break
         done
         if [ $found -eq 0 ]; then
                 echo "Unresolved symbol $sym"
         fi
 done
-