CVS commit: pkgsrc/mk/check

["Darrin B. Jewell" <dbj%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dbj
Date:           Thu Jun  7 04:58:46 UTC 2018

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

Log Message:
check-shlibs-macho.awk: fix support for checking modules

Allow the dylib install_name to be just the library basename


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mk/check/check-shlibs-macho.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-macho.awk
diff -u pkgsrc/mk/check/check-shlibs-macho.awk:1.5 pkgsrc/mk/check/check-shlibs-macho.awk:1.6
--- pkgsrc/mk/check/check-shlibs-macho.awk:1.5  Fri May 25 10:57:28 2018
+++ pkgsrc/mk/check/check-shlibs-macho.awk      Thu Jun  7 04:58:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: check-shlibs-macho.awk,v 1.5 2018/05/25 10:57:28 jperkin Exp $
+# $NetBSD: check-shlibs-macho.awk,v 1.6 2018/06/07 04:58:46 dbj Exp $
 
 #
 # Read a list of potential Mach-O binaries from stdin.
@@ -70,9 +70,18 @@ function check_pkg(DSO,      pkg, found) {
 
 function checkshlib(DSO,       needed, found) {
        cmd = "otool -XL " shquote(DSO) " 2>/dev/null"
+       libno = 0
        while ((cmd | getline) > 0) {
                if ($0 !~ /^\t/)
                        continue
+               #
+               # The first lib is the "install_name".  Allow it to
+               # be just the library basename name to support modules.
+               #
+               if (libno++ == 0 &&
+                   $1 == parts[split(DSO, parts, "/")]) {
+                       continue
+               }
                needed[$1] = ""
        }
        close(cmd)