[pkgsrc/pkgsrc-2017Q1]: pkgsrc/mk/check Pullup ticket #5372 - requested by sevan

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/26f3dc3e106e
branches:  pkgsrc-2017Q1
changeset: 360338:26f3dc3e106e
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Mon May 01 09:13:36 2017 +0000

description:
Pullup ticket #5372 - requested by sevan
mk/check/check-shlibs-elf.awk: bugfix

Revisions pulled up:
- mk/check/check-shlibs-elf.awk                                 1.14

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

diffstat:

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

diffs (35 lines):

diff -r 63f196e0a855 -r 26f3dc3e106e mk/check/check-shlibs-elf.awk
--- a/mk/check/check-shlibs-elf.awk     Mon May 01 09:08:57 2017 +0000
+++ b/mk/check/check-shlibs-elf.awk     Mon May 01 09:13:36 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.13.10.1 2017/05/01 09:13:36 bsiegert 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
                        }