[pkgsrc/trunk]: pkgsrc/mk Added the feature "asprintf", since Solaris 10 does...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f1eedb9658a2
branches:  trunk
changeset: 535514:f1eedb9658a2
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Nov 20 17:49:49 2007 +0000

description:
Added the feature "asprintf", since Solaris 10 doesn't provide it. The
missing feature is defined in the platform-specific file, which is more
elegant than adding even more of those ".if ${OPSYS} == ..." conditions.

diffstat:

 mk/features/features-vars.mk |   9 ++++++++-
 mk/features/features.mk      |  22 +++++++---------------
 mk/platform/SunOS.mk         |   3 ++-
 3 files changed, 17 insertions(+), 17 deletions(-)

diffs (85 lines):

diff -r d82389a29ed3 -r f1eedb9658a2 mk/features/features-vars.mk
--- a/mk/features/features-vars.mk      Tue Nov 20 17:46:44 2007 +0000
+++ b/mk/features/features-vars.mk      Tue Nov 20 17:49:49 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: features-vars.mk,v 1.11 2007/11/20 17:19:59 rillig Exp $
+# $NetBSD: features-vars.mk,v 1.12 2007/11/20 17:49:49 rillig Exp $
 #
 # The platforms that are supported by pkgsrc differ in the amount of
 # functions they provide in the C library (libc). Functions that are
@@ -34,6 +34,7 @@
 #      Lists the system features required by the package.
 #
 #      Possible:
+#      * asprintf: The functions asprintf and vasprintf.
 #      * err: The functions err, verr, errx, verrx.
 #      * warn: The functions warn, vwarn, warnx, vwarnx.
 #      * fts_close, fts_open, fts_read, fts_set: Functions
@@ -76,6 +77,12 @@
 MISSING_FEATURES+=     inet6
 .endif
 
+.for f in ${_OPSYS_MISSING_FEATURES}
+.  if !empty(USE_FEATURES:M${f})
+MISSING_FEATURES+=     ${f}
+.  endif
+.endfor
+
 .for _feature_ in err warn
 .  if !empty(USE_FEATURES:M${_feature_})
 .    if (${OPSYS} != NetBSD) && (${OPSYS} != FreeBSD) && (${OPSYS} != DragonFly)
diff -r d82389a29ed3 -r f1eedb9658a2 mk/features/features.mk
--- a/mk/features/features.mk   Tue Nov 20 17:46:44 2007 +0000
+++ b/mk/features/features.mk   Tue Nov 20 17:49:49 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: features.mk,v 1.4 2007/11/20 17:19:59 rillig Exp $
+# $NetBSD: features.mk,v 1.5 2007/11/20 17:49:49 rillig Exp $
 #
 # This file is included by bsd.pkg.mk.
 #
@@ -33,22 +33,14 @@
 LDFLAGS+=              ${FEATURE_LDFLAGS}
 LIBS+=                 ${FEATURE_LIBS}
 
+# libnbcompat provides many of the current features.
+#
 _FEATURE_USE_NBCOMPAT?=        no
-.  if !empty(MISSING_FEATURES:Merr) || \
-      !empty(MISSING_FEATURES:Mfts_close) || \
-      !empty(MISSING_FEATURES:Mfts_open) || \
-      !empty(MISSING_FEATURES:Mfts_read) || \
-      !empty(MISSING_FEATURES:Mfts_set) || \
-      !empty(MISSING_FEATURES:Mgetopt_long) || \
-      !empty(MISSING_FEATURES:Mglob) || \
-      !empty(MISSING_FEATURES:Mnbcompat) || \
-      !empty(MISSING_FEATURES:Mregcomp) || \
-      !empty(MISSING_FEATURES:Msnprintf) || \
-      !empty(MISSING_FEATURES:Mutimes) || \
-      !empty(MISSING_FEATURES:Mvsnprintf) || \
-      !empty(MISSING_FEATURES:Mwarn)
+.  for f in asprintf err fts_close fts_open fts_read fts_set getopt_long glob nbcompat regcomp snprintf utimes vsnprintf warn
+.    if !empty(MISSING_FEATURES:M${f})
 _FEATURE_USE_NBCOMPAT= yes
-.  endif
+.    endif
+.  endfor
 
 .  if ${_FEATURE_USE_NBCOMPAT} == "yes"
 .    include "${PKGSRCDIR}/pkgtools/libnbcompat/inplace.mk"
diff -r d82389a29ed3 -r f1eedb9658a2 mk/platform/SunOS.mk
--- a/mk/platform/SunOS.mk      Tue Nov 20 17:46:44 2007 +0000
+++ b/mk/platform/SunOS.mk      Tue Nov 20 17:49:49 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.32 2007/10/19 13:41:35 rillig Exp $
+# $NetBSD: SunOS.mk,v 1.33 2007/11/20 17:49:49 rillig Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -64,6 +64,7 @@
 _OPSYS_PERL_REQD=                      # no base version of perl required
 _OPSYS_PTHREAD_AUTO=   no              # -lpthread needed for pthreads
 _OPSYS_SHLIB_TYPE=     ELF             # shared lib type
+_OPSYS_MISSING_FEATURES=asprintf
 _PATCH_CAN_BACKUP=     yes             # native patch(1) can make backups
 _PATCH_BACKUP_ARG?=    -b -V simple -z # switch to patch(1) for backup suffix
 _USE_RPATH=            yes             # add rpath to LDFLAGS