pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk mk: Exclude /System/Library on Big Sur too.
details: https://anonhg.NetBSD.org/pkgsrc/rev/e87f9f007848
branches: trunk
changeset: 440507:e87f9f007848
user: jperkin <jperkin%pkgsrc.org@localhost>
date: Fri Oct 09 20:18:30 2020 +0000
description:
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:
mk/check/check-shlibs-macho.awk | 10 +++++++---
mk/pkgformat/pkg/metadata.mk | 4 ++--
2 files changed, 9 insertions(+), 5 deletions(-)
diffs (42 lines):
diff -r a1230e2cdf0b -r e87f9f007848 mk/check/check-shlibs-macho.awk
--- a/mk/check/check-shlibs-macho.awk Fri Oct 09 17:43:48 2020 +0000
+++ b/mk/check/check-shlibs-macho.awk Fri Oct 09 20:18:30 2020 +0000
@@ -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 @@
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 -r a1230e2cdf0b -r e87f9f007848 mk/pkgformat/pkg/metadata.mk
--- a/mk/pkgformat/pkg/metadata.mk Fri Oct 09 17:43:48 2020 +0000
+++ b/mk/pkgformat/pkg/metadata.mk Fri Oct 09 20:18:30 2020 +0000
@@ -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 @@
# 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
Home |
Main Index |
Thread Index |
Old Index