diff options
author | jperkin <jperkin@pkgsrc.org> | 2020-10-09 20:18:30 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2020-10-09 20:18:30 +0000 |
commit | fd31c074480f656bb07570d3546aeea21f4b3f36 (patch) | |
tree | 15667a366e21d27c00c40565e68b3cc21b2ce67b /mk | |
parent | e4788c4339880a5dcda8e1ad7798a2191f3252f7 (diff) | |
download | pkgsrc-fd31c074480f656bb07570d3546aeea21f4b3f36.tar.gz |
mk: Exclude /System/Library on Big Sur too.
As expected this is necessary, as early as requring the CoreFoundation
framework for devel/gettext-lib.
Diffstat (limited to 'mk')
-rw-r--r-- | mk/check/check-shlibs-macho.awk | 10 | ||||
-rw-r--r-- | mk/pkgformat/pkg/metadata.mk | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/mk/check/check-shlibs-macho.awk b/mk/check/check-shlibs-macho.awk index 2237242e70d..1c8438353be 100644 --- a/mk/check/check-shlibs-macho.awk +++ b/mk/check/check-shlibs-macho.awk @@ -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) diff --git a/mk/pkgformat/pkg/metadata.mk b/mk/pkgformat/pkg/metadata.mk index 0800a3ae8db..3f561fc9ec6 100644 --- a/mk/pkgformat/pkg/metadata.mk +++ b/mk/pkgformat/pkg/metadata.mk @@ -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 |