diff options
Diffstat (limited to 'mk/check')
| -rw-r--r-- | mk/check/check-shlibs-macho.awk | 5 | ||||
| -rw-r--r-- | mk/check/check-shlibs.mk | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mk/check/check-shlibs-macho.awk b/mk/check/check-shlibs-macho.awk index 51b750b6e6e..2237242e70d 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.7 2018/06/07 07:00:10 dbj Exp $ +# $NetBSD: check-shlibs-macho.awk,v 1.8 2020/10/09 16:00:16 jperkin Exp $ # # Read a list of potential Mach-O binaries from stdin. @@ -73,6 +73,8 @@ function checkshlib(DSO, needed, found) { while ((cmd | getline) > 0) { if ($0 !~ /^\t/) continue + if (skip_system_libs && $0 ~ /^\t\/usr\/lib/) + continue needed[$1] = "" } close(cmd) @@ -119,6 +121,7 @@ BEGIN { wrkdir = ENVIRON["WRKDIR"] pkg_info_cmd = ENVIRON["PKG_INFO_CMD"] depends_file = ENVIRON["DEPENDS_FILE"] + skip_system_libs = ENVIRON["SKIP_SYSTEM_LIBS"] } { checkshlib($0); } diff --git a/mk/check/check-shlibs.mk b/mk/check/check-shlibs.mk index 229cc13b772..90978cdf8b8 100644 --- a/mk/check/check-shlibs.mk +++ b/mk/check/check-shlibs.mk @@ -1,4 +1,4 @@ -# $NetBSD: check-shlibs.mk,v 1.32 2020/03/23 09:24:35 jperkin Exp $ +# $NetBSD: check-shlibs.mk,v 1.33 2020/10/09 16:00:16 jperkin Exp $ # # This file verifies that all libraries used by the package can be found # at run-time. @@ -64,6 +64,9 @@ CHECK_SHLIBS_NATIVE_ENV+= PLATFORM_RPATH=${_OPSYS_SYSTEM_RPATH:Q} CHECK_SHLIBS_NATIVE_ENV+= READELF=${TOOLS_PATH.readelf:Q} . elif ${OBJECT_FMT} == "Mach-O" CHECK_SHLIBS_NATIVE= ${PKGSRCDIR}/mk/check/check-shlibs-macho.awk +. if defined(DARWIN_NO_SYSTEM_LIBS) +CHECK_SHLIBS_NATIVE_ENV+= SKIP_SYSTEM_LIBS=1 +. endif . endif CHECK_SHLIBS_NATIVE_ENV+= CROSS_DESTDIR=${_CROSS_DESTDIR:Q} CHECK_SHLIBS_NATIVE_ENV+= PKG_INFO_CMD=${PKG_INFO:Q} |