[pkgsrc/trunk]: pkgsrc/mk Move -D_ALL_SOURCE for Interix, required for nearly...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d3d321030dea
branches:  trunk
changeset: 481633:d3d321030dea
user:      tv <tv%pkgsrc.org@localhost>
date:      Sat Oct 09 03:49:13 2004 +0000

description:
Move -D_ALL_SOURCE for Interix, required for nearly every compilation, from
the funky CPPFLAGS assignment into the new wrapper framework.

diffstat:

 mk/platform/Interix.mk    |  13 +++++--------
 mk/wrapper/bsd.wrapper.mk |   5 ++++-
 2 files changed, 9 insertions(+), 9 deletions(-)

diffs (61 lines):

diff -r ad5df4fd7ceb -r d3d321030dea mk/platform/Interix.mk
--- a/mk/platform/Interix.mk    Sat Oct 09 03:48:31 2004 +0000
+++ b/mk/platform/Interix.mk    Sat Oct 09 03:49:13 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
+# $NetBSD: Interix.mk,v 1.2 2004/10/09 03:49:13 tv Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -59,8 +59,6 @@
 PWD_CMD?=      /bin/pwd        # needs to print physical path
 RM?=           /bin/rm
 RMDIR?=                /bin/rmdir
-# XXX: default from bsd.pkg.defaults.mk.  Verify/corerct for this platform
-# and remove this comment.
 RSH?=          /usr/bin/rsh
 SED?=          ${LOCALBASE}/bin/nbsed
 SETENV?=       /bin/env
@@ -98,7 +96,11 @@
 NOLOGIN?=              /bin/false
 PKG_TOOLS_BIN?=                ${LOCALBASE}/sbin
 PKGDIRMODE?=           775
+.if ${BINOWN} == 197108
+ROOT_CMD?=             ${SU} - "$$(id -un 197108)" -c
+.else
 ROOT_CMD?=             ${SU} - ${ROOT_USER} -c
+.endif
 ROOT_USER?=            ${BINOWN}
 ROOT_GROUP?=           131616 # +Administrators or native language equivalent
 TOUCH_FLAGS?=
@@ -158,11 +160,6 @@
 DEFAULT_SERIAL_DEVICE?=        /dev/tty00
 SERIAL_DEVICES?=       /dev/tty00 /dev/tty01 /dev/tty02 /dev/tty03
 
-# Interix needs -D_ALL_SOURCE everywhere; little compiles without it.
-.if ${CPPFLAGS:M-D_ALL_SOURCE} == ""
-CPPFLAGS+=             -D_ALL_SOURCE
-.endif
-
 # poll(2) is broken; try to work around it by making autoconf believe
 # it's missing.  (Packages without autoconf will need explicit fixing.)
 .ifdef GNU_CONFIGURE
diff -r ad5df4fd7ceb -r d3d321030dea mk/wrapper/bsd.wrapper.mk
--- a/mk/wrapper/bsd.wrapper.mk Sat Oct 09 03:48:31 2004 +0000
+++ b/mk/wrapper/bsd.wrapper.mk Sat Oct 09 03:49:13 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.7 2004/10/06 09:49:53 grant Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.8 2004/10/09 03:49:13 tv Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -254,6 +254,9 @@
 # XXX This section is ${OPSYS}-specific and shouldn't be here.
 # XXX
 .if ${OPSYS} == "Interix"
+_WRAP_EXTRA_ARGS.CC+=  -D_ALL_SOURCE
+_WRAP_EXTRA_ARGS.CXX+= -D_ALL_SOURCE
+_WRAP_EXTRA_ARGS.CPP+= -D_ALL_SOURCE
 _WRAP_CMD_SINK.CC=     ${WRAPPER_TMPDIR}/cmd-sink-interix-gcc
 _WRAP_CMD_SINK.CXX=    ${_WRAP_CMD_SINK.CC}
 _WRAP_CMD_SINK.LD=     ${WRAPPER_TMPDIR}/cmd-sink-interix-ld