summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorsevan <sevan@pkgsrc.org>2019-07-10 17:15:27 +0000
committersevan <sevan@pkgsrc.org>2019-07-10 17:15:27 +0000
commit0e79d87dc9ca9b70a9247c10a94ed3d147bfb74c (patch)
treec85fa7e2d4da8eab26bc4faf6eda96886924183c /mk
parentef8d551af364d632ac76a0ee5a8264ee15db86bf (diff)
downloadpkgsrc-0e79d87dc9ca9b70a9247c10a94ed3d147bfb74c.tar.gz
Avoid pulling in libnbcompat on every platform, mark the specific builds of
Darwin which libnbcompat should be pulled in on to provide strnlen instead.
Diffstat (limited to 'mk')
-rw-r--r--mk/features/features-vars.mk6
-rw-r--r--mk/platform/Darwin.mk8
2 files changed, 8 insertions, 6 deletions
diff --git a/mk/features/features-vars.mk b/mk/features/features-vars.mk
index f32eb63702b..34463dc1d82 100644
--- a/mk/features/features-vars.mk
+++ b/mk/features/features-vars.mk
@@ -1,4 +1,4 @@
-# $NetBSD: features-vars.mk,v 1.25 2019/07/08 22:09:22 sevan Exp $
+# $NetBSD: features-vars.mk,v 1.26 2019/07/10 17:15:27 sevan Exp $
#
# The platforms that are supported by pkgsrc differ in the amount of
# functions they provide in the C library (libc). Functions that are
@@ -184,10 +184,6 @@ MISSING_FEATURES+= ${_feature_}
. endif
.endfor
-.if !empty(USE_FEATURES:Mstrnlen)
-MISSING_FEATURES+= strnlen
-.endif
-
.for _feature_ in utimes
. if !empty(USE_FEATURES:M${_feature_})
. if ${OPSYS} == "Interix"
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk
index d8dd00af679..cf61d9f41d4 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.94 2019/05/14 10:49:37 leot Exp $
+# $NetBSD: Darwin.mk,v 1.95 2019/07/10 17:15:27 sevan Exp $
#
# Variable definitions for the Darwin operating system.
@@ -214,3 +214,9 @@ CONFIGURE_ENV+= gl_cv_func_getcwd_abort_bug=no
exists(/bin/ksh)
WRAPPER_BIN_SH?= /bin/ksh
.endif
+
+# strnlen(3) wasn't included until Lion, pull it in from libnbcompat on prior
+# releases.
+.if ${OS_VERSION:R} <= 11
+_OPSYS_MISSING_FEATURES+= strnlen
+.endif