CVS commit: pkgsrc/mk/check

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Apr 26 11:19:16 UTC 2017

Modified Files:
        pkgsrc/mk/check: check-shlibs-elf.awk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/mk/check/check-shlibs-elf.awk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/check/check-shlibs-elf.awk
diff -u pkgsrc/mk/check/check-shlibs-elf.awk:1.13 pkgsrc/mk/check/check-shlibs-elf.awk:1.14
--- pkgsrc/mk/check/check-shlibs-elf.awk:1.13   Thu Mar 10 15:56:24 2016
+++ pkgsrc/mk/check/check-shlibs-elf.awk        Wed Apr 26 11:19:16 2017
@@ -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 @@ function checkshlib(DSO, needed, rpath, 
                    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 @@ function checkshlib(DSO, needed, rpath, 
                        }
                        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
                        }