CVS commit: pkgsrc/mk

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Oct  9 20:18:30 UTC 2020

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

Log Message:
mk: Exclude /System/Library on Big Sur too.

As expected this is necessary, as early as requring the CoreFoundation
framework for devel/gettext-lib.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/mk/check/check-shlibs-macho.awk
cvs rdiff -u -r1.30 -r1.31 pkgsrc/mk/pkgformat/pkg/metadata.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-macho.awk
diff -u pkgsrc/mk/check/check-shlibs-macho.awk:1.8 pkgsrc/mk/check/check-shlibs-macho.awk:1.9
--- pkgsrc/mk/check/check-shlibs-macho.awk:1.8  Fri Oct  9 16:00:16 2020
+++ pkgsrc/mk/check/check-shlibs-macho.awk      Fri Oct  9 20:18:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: check-shlibs-macho.awk,v 1.8 2020/10/09 16:00:16 jperkin Exp $
+# $NetBSD: check-shlibs-macho.awk,v 1.9 2020/10/09 20:18:30 jperkin Exp $
 
 #
 # Read a list of potential Mach-O binaries from stdin.
@@ -73,8 +73,12 @@ function checkshlib(DSO,     needed, found) 
        while ((cmd | getline) > 0) {
                if ($0 !~ /^\t/)
                        continue
-               if (skip_system_libs && $0 ~ /^\t\/usr\/lib/)
-                       continue
+               if (skip_system_libs) {
+                       if ($0 ~ /^\t\/System\/Library/)
+                               continue
+                       if ($0 ~ /^\t\/usr\/lib/)
+                               continue
+               }
                needed[$1] = ""
        }
        close(cmd)

Index: pkgsrc/mk/pkgformat/pkg/metadata.mk
diff -u pkgsrc/mk/pkgformat/pkg/metadata.mk:1.30 pkgsrc/mk/pkgformat/pkg/metadata.mk:1.31
--- pkgsrc/mk/pkgformat/pkg/metadata.mk:1.30    Fri Oct  9 16:00:16 2020
+++ pkgsrc/mk/pkgformat/pkg/metadata.mk Fri Oct  9 20:18:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: metadata.mk,v 1.30 2020/10/09 16:00:16 jperkin Exp $
+# $NetBSD: metadata.mk,v 1.31 2020/10/09 20:18:30 jperkin Exp $
 
 ######################################################################
 ### The targets below are all PRIVATE.
@@ -28,7 +28,7 @@ _METADATA_TARGETS+=   ${_BUILD_INFO_FILE}
 # Skip system libraries on Darwin releases where they do not exist.
 #
 .if defined(DARWIN_NO_SYSTEM_LIBS)
-DARWIN_REQUIRES_FILTER=        ${GREP} -v '\t/usr/lib'
+DARWIN_REQUIRES_FILTER=        ${EGREP} -v '\t(/System/Library|/usr/lib)'
 .else
 DARWIN_REQUIRES_FILTER=        ${CAT}
 .endif