[pkgsrc/trunk]: pkgsrc/pkgtools/bootstrap-mk-files Address PR pkg/34966 as su...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/97b8a0edd209
branches:  trunk
changeset: 521416:97b8a0edd209
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Sat Nov 11 18:24:52 2006 +0000

description:
Address PR pkg/34966 as suggested by Oliver Gould and apply the same
logic to all platforms:
Some packages (such as math/gap) create wrappers based on the name of
the compiler, so ${CC} should not contain any flags.  Move flags into
CFLAGS.

diffstat:

 pkgtools/bootstrap-mk-files/Makefile                   |   4 ++--
 pkgtools/bootstrap-mk-files/files/mods/Darwin.sys.mk   |   8 ++++----
 pkgtools/bootstrap-mk-files/files/mods/Interix.sys.mk  |   6 +++---
 pkgtools/bootstrap-mk-files/files/mods/UnixWare.sys.mk |  12 ++++++------
 4 files changed, 15 insertions(+), 15 deletions(-)

diffs (90 lines):

diff -r ac094ca65d32 -r 97b8a0edd209 pkgtools/bootstrap-mk-files/Makefile
--- a/pkgtools/bootstrap-mk-files/Makefile      Sat Nov 11 16:48:14 2006 +0000
+++ b/pkgtools/bootstrap-mk-files/Makefile      Sat Nov 11 18:24:52 2006 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2006/08/24 17:49:52 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2006/11/11 18:24:52 jschauma Exp $
 
-DISTNAME=      bootstrap-mk-files-20060824
+DISTNAME=      bootstrap-mk-files-20061111
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r ac094ca65d32 -r 97b8a0edd209 pkgtools/bootstrap-mk-files/files/mods/Darwin.sys.mk
--- a/pkgtools/bootstrap-mk-files/files/mods/Darwin.sys.mk      Sat Nov 11 16:48:14 2006 +0000
+++ b/pkgtools/bootstrap-mk-files/files/mods/Darwin.sys.mk      Sat Nov 11 18:24:52 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Darwin.sys.mk,v 1.1.1.1 2006/07/14 23:13:01 jlam Exp $
+#      $NetBSD: Darwin.sys.mk,v 1.2 2006/11/11 18:24:52 jschauma Exp $
 #      @(#)sys.mk      8.2 (Berkeley) 3/21/94
 
 unix=          We run UNIX.
@@ -21,12 +21,12 @@
 LINK.S?=       ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 .if exists(/usr/bin/gcc)
-CC?=           gcc -pipe
+CC?=           gcc
 .else
-CC?=           cc -pipe
+CC?=           cc
 .endif
 DBG?=          -O2
-CFLAGS?=       ${DBG}
+CFLAGS?=       -pipe ${DBG}
 COMPILE.c?=    ${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=       ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
diff -r ac094ca65d32 -r 97b8a0edd209 pkgtools/bootstrap-mk-files/files/mods/Interix.sys.mk
--- a/pkgtools/bootstrap-mk-files/files/mods/Interix.sys.mk     Sat Nov 11 16:48:14 2006 +0000
+++ b/pkgtools/bootstrap-mk-files/files/mods/Interix.sys.mk     Sat Nov 11 18:24:52 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Interix.sys.mk,v 1.1.1.1 2006/07/14 23:13:01 jlam Exp $
+#      $NetBSD: Interix.sys.mk,v 1.2 2006/11/11 18:24:52 jschauma Exp $
 
 unix?=         We run Unix
 OS!=           uname -s
@@ -20,11 +20,11 @@
 LINK.S?=       ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 # Unless told otherwise, assume GNU CC
-CC?=           gcc -D_ALL_SOURCE
+CC?=           gcc
 
 DBG?=          -O
 
-CFLAGS?=       ${DBG}
+CFLAGS?=       -D_ALL_SOURCE ${DBG}
 COMPILE.c?=    ${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=       ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
diff -r ac094ca65d32 -r 97b8a0edd209 pkgtools/bootstrap-mk-files/files/mods/UnixWare.sys.mk
--- a/pkgtools/bootstrap-mk-files/files/mods/UnixWare.sys.mk    Sat Nov 11 16:48:14 2006 +0000
+++ b/pkgtools/bootstrap-mk-files/files/mods/UnixWare.sys.mk    Sat Nov 11 18:24:52 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: UnixWare.sys.mk,v 1.1.1.1 2006/07/14 23:13:01 jlam Exp $
+#      $NetBSD: UnixWare.sys.mk,v 1.2 2006/11/11 18:24:52 jschauma Exp $
 #      NetBSD: SunOS.sys.mk,v 1.1.1.1 2004/03/11 13:04:00 grant Exp
 #      NetBSD: sys.mk,v 1.58 2000/08/22 17:38:49 bjh21 Exp 
 #      @(#)sys.mk      8.2 (Berkeley) 3/21/94
@@ -22,15 +22,15 @@
 COMPILE.S?=    ${CC} ${AFLAGS} ${CPPFLAGS} -c -traditional-cpp
 LINK.S?=       ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
+CC?=           gcc
+DBG?=          -O2
 # gcc on Unixware has no internal macro to identify the system
-CC?=           gcc -DUNIXWARE
-DBG?=          -O2
-CFLAGS?=       ${DBG}
+CFLAGS?=       -DUNIXWARE ${DBG}
 COMPILE.c?=    ${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=       ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
-CXX?=          g++ -DUNIXWARE
-CXXFLAGS?=     ${CFLAGS}
+CXX?=          g++
+CXXFLAGS?=     -DUNIXWARE ${CFLAGS}
 COMPILE.cc?=   ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c
 LINK.cc?=      ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}