CVS commit: pkgsrc/mk/check

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Oct 11 20:26:28 UTC 2021

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

Log Message:
mk: Rename variable to CHECK_SHLIBS_TOXIC.

Improves language and mirrors LD_TOXIC_PATH nomenclature available on at
least the SunOS dynamic linker.  The previous name is retained for now
for compatibility, even though I get the feeling I'm the only person who
is actually using this feature.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/mk/check/check-shlibs-elf.awk
cvs rdiff -u -r1.33 -r1.34 pkgsrc/mk/check/check-shlibs.mk

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.18 pkgsrc/mk/check/check-shlibs-elf.awk:1.19
--- pkgsrc/mk/check/check-shlibs-elf.awk:1.18   Thu Jan 16 22:53:11 2020
+++ pkgsrc/mk/check/check-shlibs-elf.awk        Mon Oct 11 20:26:28 2021
@@ -1,4 +1,4 @@
-# $NetBSD: check-shlibs-elf.awk,v 1.18 2020/01/16 22:53:11 joerg Exp $
+# $NetBSD: check-shlibs-elf.awk,v 1.19 2021/10/11 20:26:28 jperkin Exp $
 #
 # Copyright (c) 2007 Joerg Sonnenberger <joerg%NetBSD.org@localhost>.
 # All rights reserved.
@@ -127,7 +127,7 @@ function checkshlib(DSO, needed, rpath, 
                        print DSO ": rpath relative to WRKDIR"
                }
        }
-       nblist = split(blacklist, blist, " ")
+       ntpaths = split(toxic, tpaths, " ")
        nedirs = split(extradirs, edirs, " ")
        for (lib in needed) {
                found = 0
@@ -138,9 +138,9 @@ function checkshlib(DSO, needed, rpath, 
                        }
                        if (!libcache[libfile]) {
                                check_pkg(rpath[p] "/" lib)
-                               for (b = 1; b <= nblist; b++) {
-                                       if (match(rpath[p] "/" lib, blist[b])) {
-                                               print DSO ": resolved path " rpath[p] "/" lib " matches blacklist " blist[b]
+                               for (t = 1; t <= ntpaths; t++) {
+                                       if (match(rpath[p] "/" lib, tpaths[t])) {
+                                               print DSO ": resolved path " rpath[p] "/" lib " matches toxic " tpaths[t]
                                        }
                                }
                                for (e = 1; e <= nedirs; e++) {
@@ -175,7 +175,7 @@ BEGIN {
        readelf = ENVIRON["READELF"]
        wrkdir = ENVIRON["WRKDIR"]
        extradirs = ENVIRON["CHECK_WRKREF_EXTRA_DIRS"]
-       blacklist = ENVIRON["CHECK_SHLIBS_BLACKLIST"]
+       toxic = ENVIRON["CHECK_SHLIBS_TOXIC"]
        pkg_info_cmd = ENVIRON["PKG_INFO_CMD"]
        depends_file = ENVIRON["DEPENDS_FILE"]
        if (readelf == "")

Index: pkgsrc/mk/check/check-shlibs.mk
diff -u pkgsrc/mk/check/check-shlibs.mk:1.33 pkgsrc/mk/check/check-shlibs.mk:1.34
--- pkgsrc/mk/check/check-shlibs.mk:1.33        Fri Oct  9 16:00:16 2020
+++ pkgsrc/mk/check/check-shlibs.mk     Mon Oct 11 20:26:28 2021
@@ -1,4 +1,4 @@
-# $NetBSD: check-shlibs.mk,v 1.33 2020/10/09 16:00:16 jperkin Exp $
+# $NetBSD: check-shlibs.mk,v 1.34 2021/10/11 20:26:28 jperkin Exp $
 #
 # This file verifies that all libraries used by the package can be found
 # at run-time.
@@ -10,10 +10,10 @@
 #
 #      Default value: "yes" for PKG_DEVELOPERs, "no" otherwise.
 #
-# CHECK_SHLIBS_BLACKLIST
+# CHECK_SHLIBS_TOXIC
 #      A list of regular expressions that will cause the test to fail
-#      if they are matched in the resolved runpath.  For example, set
-#      to ^/usr/lib/lib(crypto|ssl) will ensure that OpenSSL is not
+#      if they match any resolved library paths.  For example, set
+#      to ^/usr/lib/lib(crypto|ssl) ensures that OpenSSL is not
 #      accidentally picked up from the OS.
 #
 #      Default value: empty.
@@ -77,8 +77,10 @@ CHECK_SHLIBS_NATIVE_ENV+=    LANG=C
 .  if defined(CHECK_WRKREF) && !empty(CHECK_WRKREF:Mextra)
 CHECK_SHLIBS_NATIVE_ENV+=      CHECK_WRKREF_EXTRA_DIRS=${CHECK_WRKREF_EXTRA_DIRS:Q}
 .  endif
-.  if defined(CHECK_SHLIBS_BLACKLIST)
-CHECK_SHLIBS_NATIVE_ENV+=      CHECK_SHLIBS_BLACKLIST=${CHECK_SHLIBS_BLACKLIST:Q}
+.  if defined(CHECK_SHLIBS_TOXIC)
+CHECK_SHLIBS_NATIVE_ENV+=      CHECK_SHLIBS_TOXIC=${CHECK_SHLIBS_TOXIC:Q}
+.  elif defined(CHECK_SHLIBS_BLACKLIST)
+CHECK_SHLIBS_NATIVE_ENV+=      CHECK_SHLIBS_TOXIC=${CHECK_SHLIBS_BLACKLIST:Q}
 .  endif
 
 privileged-install-hook: _check-shlibs