diff options
| author | jperkin <jperkin> | 2017-04-26 11:19:16 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2017-04-26 11:19:16 +0000 |
| commit | 0d3e5552dfed8390747827f01c995ebbd034490f (patch) | |
| tree | 4f3ebe59a5aef4fe09b47dcddf59dd5c3efd4f8d /mk | |
| parent | 4bb8a0e15f8f21be46c10c1035903b810816b318 (diff) | |
| download | pkgsrc-0d3e5552dfed8390747827f01c995ebbd034490f.tar.gz | |
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 (limited to 'mk')
| -rw-r--r-- | mk/check/check-shlibs-elf.awk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mk/check/check-shlibs-elf.awk b/mk/check/check-shlibs-elf.awk index ec3eaee6db4..8f934896ee2 100644 --- a/mk/check/check-shlibs-elf.awk +++ b/mk/check/check-shlibs-elf.awk @@ -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>. # All rights reserved. @@ -127,12 +127,6 @@ function checkshlib(DSO, needed, rpath, found, dso_rpath, got_rpath, nrpath) { 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, found, dso_rpath, got_rpath, nrpath) { } 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 } |