[pkgsrc/trunk]: pkgsrc/mk CPP_PRECOMP_FLAGS is a Darwinism only. Move its fr...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/744416f02045
branches:  trunk
changeset: 483643:744416f02045
user:      tv <tv%pkgsrc.org@localhost>
date:      Tue Nov 16 16:21:40 2004 +0000

description:
CPP_PRECOMP_FLAGS is a Darwinism only.  Move its frobbing of CPPFLAGS to
platform/Darwin.mk (simplification).

diffstat:

 mk/bsd.pkg.mk            |  4 +---
 mk/platform/AIX.mk       |  3 +--
 mk/platform/BSDOS.mk     |  3 +--
 mk/platform/Darwin.mk    |  3 ++-
 mk/platform/DragonFly.mk |  3 +--
 mk/platform/FreeBSD.mk   |  3 +--
 mk/platform/IRIX.mk      |  3 +--
 mk/platform/Interix.mk   |  3 +--
 mk/platform/Linux.mk     |  3 +--
 mk/platform/NetBSD.mk    |  3 +--
 mk/platform/OpenBSD.mk   |  3 +--
 mk/platform/SunOS.mk     |  3 +--
 mk/platform/UnixWare.mk  |  3 +--
 13 files changed, 14 insertions(+), 26 deletions(-)

diffs (222 lines):

diff -r 8e2bf0171365 -r 744416f02045 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue Nov 16 16:16:31 2004 +0000
+++ b/mk/bsd.pkg.mk     Tue Nov 16 16:21:40 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1537 2004/11/14 07:23:07 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1538 2004/11/16 16:21:40 tv Exp $
 #
 # This file is in the public domain.
 #
@@ -379,8 +379,6 @@
 .  endfor
 .endif
 
-CPPFLAGS+=     ${CPP_PRECOMP_FLAGS}
-
 # If GNU_CONFIGURE is defined, then pass LIBS to the GNU configure script.
 # also pass in a CONFIG_SHELL to avoid picking up bash
 .if defined(GNU_CONFIGURE)
diff -r 8e2bf0171365 -r 744416f02045 mk/platform/AIX.mk
--- a/mk/platform/AIX.mk        Tue Nov 16 16:16:31 2004 +0000
+++ b/mk/platform/AIX.mk        Tue Nov 16 16:21:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
+# $NetBSD: AIX.mk,v 1.3 2004/11/16 16:21:40 tv Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -118,7 +118,6 @@
 DEPENDS+=      ${USE_GROUPADD:D${_USER_DEPENDS}}
 .endif
 
-CPP_PRECOMP_FLAGS?=    # unset
 DEF_UMASK?=            0022
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table
 MOTIF_TYPE_DEFAULT?=   openmotif       # default 2.0 compatible libs type
diff -r 8e2bf0171365 -r 744416f02045 mk/platform/BSDOS.mk
--- a/mk/platform/BSDOS.mk      Tue Nov 16 16:16:31 2004 +0000
+++ b/mk/platform/BSDOS.mk      Tue Nov 16 16:21:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
+# $NetBSD: BSDOS.mk,v 1.3 2004/11/16 16:21:40 tv Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
@@ -98,7 +98,6 @@
 USERADD?=      /usr/sbin/adduser
 GROUPADD?=     /usr/sbin/addgroup
 
-CPP_PRECOMP_FLAGS?=    # unset
 DEF_UMASK?=            0022
 .if ${OBJECT_FMT} == "ELF"
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table
diff -r 8e2bf0171365 -r 744416f02045 mk/platform/Darwin.mk
--- a/mk/platform/Darwin.mk     Tue Nov 16 16:16:31 2004 +0000
+++ b/mk/platform/Darwin.mk     Tue Nov 16 16:21:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
+# $NetBSD: Darwin.mk,v 1.3 2004/11/16 16:21:40 tv Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -87,6 +87,7 @@
 .if !defined(PKGSRC_COMPILER) || !empty(PKGSRC_COMPILER:Mgcc)
 CPP_PRECOMP_FLAGS?=    -no-cpp-precomp # use the GNU cpp, not the OS X cpp
 .endif
+CPPFLAGS+=             ${CPP_PRECOMP_FLAGS}
 DEF_UMASK?=            0022
 DEFAULT_SERIAL_DEVICE?=        /dev/null
 EXPORT_SYMBOLS_LDFLAGS?=       # Don't add symbols to the dynamic symbol table
diff -r 8e2bf0171365 -r 744416f02045 mk/platform/DragonFly.mk
--- a/mk/platform/DragonFly.mk  Tue Nov 16 16:16:31 2004 +0000
+++ b/mk/platform/DragonFly.mk  Tue Nov 16 16:21:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DragonFly.mk,v 1.2 2004/11/02 22:24:35 wiz Exp $
+# $NetBSD: DragonFly.mk,v 1.3 2004/11/16 16:21:40 tv Exp $
 #
 # Variable definitions for the DragonFly operating system.
 
@@ -98,7 +98,6 @@
 DEPENDS+=      ${USE_GROUPADD:D${_USER_DEPENDS}}
 .endif
 
-CPP_PRECOMP_FLAGS?=    # unset
 DEF_UMASK?=            0022
 .if ${OBJECT_FMT} == "ELF"
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table
diff -r 8e2bf0171365 -r 744416f02045 mk/platform/FreeBSD.mk
--- a/mk/platform/FreeBSD.mk    Tue Nov 16 16:16:31 2004 +0000
+++ b/mk/platform/FreeBSD.mk    Tue Nov 16 16:21:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
+# $NetBSD: FreeBSD.mk,v 1.3 2004/11/16 16:21:40 tv Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -98,7 +98,6 @@
 DEPENDS+=      ${USE_GROUPADD:D${_USER_DEPENDS}}
 .endif
 
-CPP_PRECOMP_FLAGS?=    # unset
 DEF_UMASK?=            0022
 .if ${OBJECT_FMT} == "ELF"
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table
diff -r 8e2bf0171365 -r 744416f02045 mk/platform/IRIX.mk
--- a/mk/platform/IRIX.mk       Tue Nov 16 16:16:31 2004 +0000
+++ b/mk/platform/IRIX.mk       Tue Nov 16 16:21:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.4 2004/11/15 14:48:18 tv Exp $
+# $NetBSD: IRIX.mk,v 1.5 2004/11/16 16:21:40 tv Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -92,7 +92,6 @@
 WC?=           /sbin/wc
 XARGS?=                /sbin/xargs
 
-CPP_PRECOMP_FLAGS?=    # unset
 DEF_UMASK?=            022
 DEFAULT_SERIAL_DEVICE?=        /dev/null
 EXPORT_SYMBOLS_LDFLAGS?=       # Don't add symbols to the dynamic symbol table
diff -r 8e2bf0171365 -r 744416f02045 mk/platform/Interix.mk
--- a/mk/platform/Interix.mk    Tue Nov 16 16:16:31 2004 +0000
+++ b/mk/platform/Interix.mk    Tue Nov 16 16:21:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.10 2004/10/29 15:15:50 tv Exp $
+# $NetBSD: Interix.mk,v 1.11 2004/11/16 16:21:40 tv Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -111,7 +111,6 @@
 DEPENDS+=              ${USE_USERADD:D${_USER_DEPENDS}}
 DEPENDS+=              ${USE_GROUPADD:D${_USER_DEPENDS}}
 
-CPP_PRECOMP_FLAGS?=    # unset
 DEF_UMASK?=            002
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table
 
diff -r 8e2bf0171365 -r 744416f02045 mk/platform/Linux.mk
--- a/mk/platform/Linux.mk      Tue Nov 16 16:16:31 2004 +0000
+++ b/mk/platform/Linux.mk      Tue Nov 16 16:21:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.3 2004/11/15 14:48:18 tv Exp $
+# $NetBSD: Linux.mk,v 1.4 2004/11/16 16:21:40 tv Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -129,7 +129,6 @@
 WC?=           /usr/bin/wc
 XARGS?=                /usr/bin/xargs -r
 
-CPP_PRECOMP_FLAGS?=    # unset
 DEF_UMASK?=            022
 DEFAULT_SERIAL_DEVICE?=        /dev/null
 EXPORT_SYMBOLS_LDFLAGS?=       # Don't add symbols to the dynamic symbol table
diff -r 8e2bf0171365 -r 744416f02045 mk/platform/NetBSD.mk
--- a/mk/platform/NetBSD.mk     Tue Nov 16 16:16:31 2004 +0000
+++ b/mk/platform/NetBSD.mk     Tue Nov 16 16:21:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.3 2004/11/11 22:29:40 tv Exp $
+# $NetBSD: NetBSD.mk,v 1.4 2004/11/16 16:21:40 tv Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -91,7 +91,6 @@
 DEPENDS+=      ${USE_GROUPADD:D${_USER_DEPENDS}}
 .endif
 
-CPP_PRECOMP_FLAGS?=    # unset
 DEF_UMASK?=            0022
 .if ${OBJECT_FMT} == "ELF"
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table
diff -r 8e2bf0171365 -r 744416f02045 mk/platform/OpenBSD.mk
--- a/mk/platform/OpenBSD.mk    Tue Nov 16 16:16:31 2004 +0000
+++ b/mk/platform/OpenBSD.mk    Tue Nov 16 16:21:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
+# $NetBSD: OpenBSD.mk,v 1.3 2004/11/16 16:21:40 tv Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -89,7 +89,6 @@
 DEPENDS+=      ${USE_GROUPADD:D${_USER_DEPENDS}}
 .endif
 
-CPP_PRECOMP_FLAGS?=    # unset
 DEF_UMASK?=            0022
 .if ${OBJECT_FMT} == "ELF"
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table
diff -r 8e2bf0171365 -r 744416f02045 mk/platform/SunOS.mk
--- a/mk/platform/SunOS.mk      Tue Nov 16 16:16:31 2004 +0000
+++ b/mk/platform/SunOS.mk      Tue Nov 16 16:21:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.5 2004/11/15 14:48:18 tv Exp $
+# $NetBSD: SunOS.mk,v 1.6 2004/11/16 16:21:40 tv Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -90,7 +90,6 @@
 WC?=           /usr/bin/wc
 XARGS?=                /usr/bin/xargs
 
-CPP_PRECOMP_FLAGS?=    # unset
 DEF_UMASK?=            022
 DEFAULT_SERIAL_DEVICE?=        /dev/null
 EXPORT_SYMBOLS_LDFLAGS?=       # Don't add symbols to the dynamic symbol table
diff -r 8e2bf0171365 -r 744416f02045 mk/platform/UnixWare.mk
--- a/mk/platform/UnixWare.mk   Tue Nov 16 16:16:31 2004 +0000
+++ b/mk/platform/UnixWare.mk   Tue Nov 16 16:21:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: UnixWare.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
+# $NetBSD: UnixWare.mk,v 1.3 2004/11/16 16:21:40 tv Exp $
 #
 # Variable definitions for the UnixWare 7 operating system.
 
@@ -86,7 +86,6 @@
 WC?=           /usr/bin/wc
 XARGS?=                /usr/bin/xargs
 
-CPP_PRECOMP_FLAGS?=    # unset
 DEF_UMASK?=            022
 DEFAULT_SERIAL_DEVICE?=        /dev/null
 EXPORT_SYMBOLS_LDFLAGS?=       # Don't add symbols to the dynamic symbol table