pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Avoid pulling in libnbcompat on every platform, mar...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/77939b1df3c3
branches:  trunk
changeset: 336279:77939b1df3c3
user:      sevan <sevan%pkgsrc.org@localhost>
date:      Wed Jul 10 17:15:27 2019 +0000

description:
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:

 mk/features/features-vars.mk |  6 +-----
 mk/platform/Darwin.mk        |  8 +++++++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (39 lines):

diff -r 0a3fbe1ecf26 -r 77939b1df3c3 mk/features/features-vars.mk
--- a/mk/features/features-vars.mk      Wed Jul 10 12:59:53 2019 +0000
+++ b/mk/features/features-vars.mk      Wed Jul 10 17:15:27 2019 +0000
@@ -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 @@
 .  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 -r 0a3fbe1ecf26 -r 77939b1df3c3 mk/platform/Darwin.mk
--- a/mk/platform/Darwin.mk     Wed Jul 10 12:59:53 2019 +0000
+++ b/mk/platform/Darwin.mk     Wed Jul 10 17:15:27 2019 +0000
@@ -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 @@
     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



Home | Main Index | Thread Index | Old Index