CVS commit: pkgsrc/mk

["Sevan Janiyan" <sevan%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sevan
Date:           Wed Jul 10 17:15:27 UTC 2019

Modified Files:
        pkgsrc/mk/features: features-vars.mk
        pkgsrc/mk/platform: Darwin.mk

Log Message:
Avoid pulling in libnbcompat on every platform, mark the specific builds of
Darwin which libnbcompat should be pulled in on to provide strnlen instead.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/mk/features/features-vars.mk
cvs rdiff -u -r1.94 -r1.95 pkgsrc/mk/platform/Darwin.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/features/features-vars.mk
diff -u pkgsrc/mk/features/features-vars.mk:1.25 pkgsrc/mk/features/features-vars.mk:1.26
--- pkgsrc/mk/features/features-vars.mk:1.25    Mon Jul  8 22:09:22 2019
+++ pkgsrc/mk/features/features-vars.mk Wed Jul 10 17:15:27 2019
@@ -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"

Index: pkgsrc/mk/platform/Darwin.mk
diff -u pkgsrc/mk/platform/Darwin.mk:1.94 pkgsrc/mk/platform/Darwin.mk:1.95
--- pkgsrc/mk/platform/Darwin.mk:1.94   Tue May 14 10:49:37 2019
+++ pkgsrc/mk/platform/Darwin.mk        Wed Jul 10 17:15:27 2019
@@ -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
     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