Wed May 12 20:57:46 2010 UTC ()
In SunOS, use cpp rather than ${CC} -E, as gcc -E is broken.

If /usr/ucb/lib/cpp is in the path before gnu cpp this could break things
but that is not an expected situation.  The only executable in /usr/ucb/lib
is cpp, so there is no other reason to add it to the path.

This should fix PR#42624


(tez)
diff -r1.24 -r1.25 pkgsrc/pkgtools/bootstrap-mk-files/Makefile
diff -r1.2 -r1.3 pkgsrc/pkgtools/bootstrap-mk-files/files/mods/SunOS.sys.mk
cvs diff -r1.24 -r1.25 pkgsrc/pkgtools/bootstrap-mk-files/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/bootstrap-mk-files/Makefile 2010/01/15 22:00:36 1.24
+++ pkgsrc/pkgtools/bootstrap-mk-files/Makefile 2010/05/12 20:57:46 1.25
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.24 2010/01/15 22:00:36 abs Exp $ 1# $NetBSD: Makefile,v 1.25 2010/05/12 20:57:46 tez Exp $
2 2
3DISTNAME= bootstrap-mk-files-20090807 3DISTNAME= bootstrap-mk-files-20090807
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= pkgtools 5CATEGORIES= pkgtools
6MASTER_SITES= # empty 6MASTER_SITES= # empty
7DISTFILES= # empty 7DISTFILES= # empty
8 8
9CONFLICTS+= mk-files-[0-9]* 9CONFLICTS+= mk-files-[0-9]*
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.pkgsrc.org/ 12HOMEPAGE= http://www.pkgsrc.org/
13COMMENT= *.mk files for the bootstrap bmake utility 13COMMENT= *.mk files for the bootstrap bmake utility
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17NO_PKGTOOLS_REQD_CHECK= # defined 17NO_PKGTOOLS_REQD_CHECK= # defined
cvs diff -r1.2 -r1.3 pkgsrc/pkgtools/bootstrap-mk-files/files/mods/SunOS.sys.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/bootstrap-mk-files/files/mods/SunOS.sys.mk 2008/02/11 15:12:39 1.2
+++ pkgsrc/pkgtools/bootstrap-mk-files/files/mods/SunOS.sys.mk 2010/05/12 20:57:46 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: SunOS.sys.mk,v 1.2 2008/02/11 15:12:39 tnn Exp $ 1# $NetBSD: SunOS.sys.mk,v 1.3 2010/05/12 20:57:46 tez Exp $
2# NetBSD: sys.mk,v 1.58 2000/08/22 17:38:49 bjh21 Exp  2# NetBSD: sys.mk,v 1.58 2000/08/22 17:38:49 bjh21 Exp
3# @(#)sys.mk 8.2 (Berkeley) 3/21/94 3# @(#)sys.mk 8.2 (Berkeley) 3/21/94
4 4
5unix?= We run Unix. 5unix?= We run Unix.
6OS?= SunOS.5 6OS?= SunOS.5
7 7
8.SUFFIXES: .out .a .ln .o .s .S .c .cc .cpp .cxx .C .F .f .r .y .l .cl .p .h 8.SUFFIXES: .out .a .ln .o .s .S .c .cc .cpp .cxx .C .F .f .r .y .l .cl .p .h
9.SUFFIXES: .sh .m4 9.SUFFIXES: .sh .m4
10  10
11.LIBS: .a 11.LIBS: .a
12 12
13AR?= ar 13AR?= ar
14ARFLAGS?= rl 14ARFLAGS?= rl
@@ -30,27 +30,33 @@ CFLAGS?= ${DBG} @@ -30,27 +30,33 @@ CFLAGS?= ${DBG}
30COMPILE.c?= ${CC} ${CFLAGS} ${CPPFLAGS} -c 30COMPILE.c?= ${CC} ${CFLAGS} ${CPPFLAGS} -c
31LINK.c?= ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} 31LINK.c?= ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
32 32
33CXX?= g++ 33CXX?= g++
34CXXFLAGS?= ${CFLAGS} 34CXXFLAGS?= ${CFLAGS}
35COMPILE.cc?= ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c 35COMPILE.cc?= ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c
36LINK.cc?= ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} 36LINK.cc?= ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}
37 37
38OBJC?= ${CC} 38OBJC?= ${CC}
39OBJCFLAGS?= ${CFLAGS} 39OBJCFLAGS?= ${CFLAGS}
40COMPILE.m?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c 40COMPILE.m?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c
41LINK.m?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${LDFLAGS} 41LINK.m?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${LDFLAGS}
42 42
 43# use cpp if using gcc, else use ${CC} -E as gcc -E is broken pr#42624
 44# if /usr/ucb/lib/cpp is in the path before gnu cpp this could break things
 45.if !empty(CC:Mgcc)
 46CPP?= cpp
 47.else
43CPP?= ${CC} -E 48CPP?= ${CC} -E
 49.endif
44.if defined(NETBSD_COMPATIBLE) 50.if defined(NETBSD_COMPATIBLE)
45CPPFLAGS?= -I${BSDDIR}/include -D__EXTENSIONS__ -D_XPG4_2 -DSUNOS_5 51CPPFLAGS?= -I${BSDDIR}/include -D__EXTENSIONS__ -D_XPG4_2 -DSUNOS_5
46HOST_CPPFLAGS?= ${CPPFLAGS} 52HOST_CPPFLAGS?= ${CPPFLAGS}
47NOLINT=1 53NOLINT=1
48.else 54.else
49CPPFLAGS?= 55CPPFLAGS?=
50.endif 56.endif
51 57
52FC?= f77 58FC?= f77
53FFLAGS?= -O 59FFLAGS?= -O
54RFLAGS?= 60RFLAGS?=
55COMPILE.f?= ${FC} ${FFLAGS} -c 61COMPILE.f?= ${FC} ${FFLAGS} -c
56LINK.f?= ${FC} ${FFLAGS} ${LDFLAGS} 62LINK.f?= ${FC} ${FFLAGS} ${LDFLAGS}