[pkgsrc/trunk]: pkgsrc/mk/check Only perform the CHECK_WRKREF_EXTRA_DIRS chec...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f0e8e848e1f5
branches:  trunk
changeset: 361761:f0e8e848e1f5
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Apr 26 11:19:16 2017 +0000

description:
Only perform the CHECK_WRKREF_EXTRA_DIRS check on the resolved path rather
than on all of the rpaths.  We can't always exclude the rpath being added,
for example when the compiler adds its own behind our back, so this avoids
false positives.

diffstat:

 mk/check/check-shlibs-elf.awk |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (35 lines):

diff -r 75934a8e6d8a -r f0e8e848e1f5 mk/check/check-shlibs-elf.awk
--- a/mk/check/check-shlibs-elf.awk     Wed Apr 26 10:27:43 2017 +0000
+++ b/mk/check/check-shlibs-elf.awk     Wed Apr 26 11:19:16 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: check-shlibs-elf.awk,v 1.13 2016/03/10 15:56:24 jperkin Exp $
+# $NetBSD: check-shlibs-elf.awk,v 1.14 2017/04/26 11:19:16 jperkin Exp $
 #
 # Copyright (c) 2007 Joerg Sonnenberger <joerg%NetBSD.org@localhost>.
 # All rights reserved.
@@ -127,12 +127,6 @@
                    substr(rpath[p], 1, length(wrkdir) + 1) == wrkdir "/") {
                        print DSO ": rpath relative to WRKDIR"
                }
-               for (e = 1; e <= nedirs; e++) {
-                       if (rpath[p] == edirs[e] ||
-                           substr(rpath[p], 1, length(edirs[e]) + 1) == edirs[e] "/") {
-                               print DSO ": rpath " rpath[p] " relative to CHECK_WRKREF_EXTRA_DIRS directory " edirs[e]
-                       }
-               }
        }
        for (lib in needed) {
                found = 0
@@ -143,6 +137,12 @@
                        }
                        if (!libcache[libfile]) {
                                check_pkg(rpath[p] "/" lib)
+                               for (e = 1; e <= nedirs; e++) {
+                                       if (rpath[p] == edirs[e] ||
+                                           substr(rpath[p], 1, length(edirs[e]) + 1) == edirs[e] "/") {
+                                               print DSO ": rpath " rpath[p] " relative to CHECK_WRKREF_EXTRA_DIRS directory " edirs[e]
+                                       }
+                               }
                                found = 1
                                break
                        }