Module Name: src
Committed By: plunky
Date: Sun Mar 7 16:27:18 UTC 2010
Modified Files:
src/distrib/sets/lists/comp: mi
src/external/bsd/pcc/include: config.h
src/external/bsd/pcc/libexec/cpp: Makefile
Log Message:
Install PCC cpp as libexec/pcpp to avoid name conflicts with other
compilers (eg GCC), and to match the manpage which is already installed
as pcpp.1
(Gregory McGarry: "I think it's a good idea")
To generate a diff of this commit:
cvs rdiff -u -r1.1403 -r1.1404 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/pcc/include/config.h
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/pcc/libexec/cpp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1403 src/distrib/sets/lists/comp/mi:1.1404
--- src/distrib/sets/lists/comp/mi:1.1403 Sat Mar 6 16:42:55 2010
+++ src/distrib/sets/lists/comp/mi Sun Mar 7 16:27:17 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1403 2010/03/06 16:42:55 dsieger Exp $
+# $NetBSD: mi,v 1.1404 2010/03/07 16:27:17 plunky Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3343,7 +3343,7 @@
./usr/libdata/debug/usr/libexec/ching/castching.debug comp-games-debug debug
./usr/libdata/debug/usr/libexec/ching/printching.debug comp-games-debug debug
./usr/libdata/debug/usr/libexec/comsat.debug comp-mail-debug debug
-./usr/libdata/debug/usr/libexec/cpp.debug comp-c-debug pcccmds,debug
+./usr/libdata/debug/usr/libexec/cpp.debug comp-obsolete pcccmds,obsolete
./usr/libdata/debug/usr/libexec/f771.debug comp-fortran-debug gcc=3,gcccmds,debug
./usr/libdata/debug/usr/libexec/f771.debug comp-obsolete gcc=4,obsolete
./usr/libdata/debug/usr/libexec/fingerd.debug comp-netutil-debug debug
@@ -3368,6 +3368,7 @@
./usr/libdata/debug/usr/libexec/makekey.debug comp-crypto-debug debug
./usr/libdata/debug/usr/libexec/makewhatis.debug comp-man-debug debug
./usr/libdata/debug/usr/libexec/ntalkd.debug comp-netutil-debug debug
+./usr/libdata/debug/usr/libexec/pcpp.debug comp-c-debug pcccmds,debug
./usr/libdata/debug/usr/libexec/postfix/anvil.debug comp-postfix-debug postfix,debug
./usr/libdata/debug/usr/libexec/postfix/bounce.debug comp-postfix-debug postfix,debug
./usr/libdata/debug/usr/libexec/postfix/cleanup.debug comp-postfix-debug postfix,debug
@@ -3771,11 +3772,12 @@
./usr/libexec/cc1plus comp-cxx-bin gcccmds
./usr/libexec/ccom comp-c-bin pcccmds
./usr/libexec/collect2 comp-obsolete obsolete
-./usr/libexec/cpp comp-c-bin pcccmds
+./usr/libexec/cpp comp-obsolete pcccmds,obsolete
./usr/libexec/f771 comp-fortran-bin gcc=3,gcccmds
./usr/libexec/f771 comp-obsolete gcc=4,obsolete
./usr/libexec/lint1 comp-c-bin
./usr/libexec/lint2 comp-c-bin
+./usr/libexec/pcpp comp-c-bin pcccmds
./usr/sbin/config comp-obsolete obsolete
./usr/sbin/config.new comp-obsolete obsolete
./usr/sbin/genassym comp-obsolete obsolete
Index: src/external/bsd/pcc/include/config.h
diff -u src/external/bsd/pcc/include/config.h:1.1 src/external/bsd/pcc/include/config.h:1.2
--- src/external/bsd/pcc/include/config.h:1.1 Thu Feb 11 14:22:30 2010
+++ src/external/bsd/pcc/include/config.h Sun Mar 7 16:27:18 2010
@@ -149,7 +149,7 @@
/* #undef PECOFFABI */
/* Define path to alternate preprocessor */
-/* #undef PREPROCESSOR */
+#define PREPROCESSOR "pcpp"
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
Index: src/external/bsd/pcc/libexec/cpp/Makefile
diff -u src/external/bsd/pcc/libexec/cpp/Makefile:1.6 src/external/bsd/pcc/libexec/cpp/Makefile:1.7
--- src/external/bsd/pcc/libexec/cpp/Makefile:1.6 Fri Feb 5 08:37:48 2010
+++ src/external/bsd/pcc/libexec/cpp/Makefile Sun Mar 7 16:27:18 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/02/05 08:37:48 plunky Exp $
+# $NetBSD: Makefile,v 1.7 2010/03/07 16:27:18 plunky Exp $
WARNS?= 2
@@ -7,16 +7,21 @@
.PATH: ${PCC_DIST}/cc/cpp \
${PCC_DIST}/mip
-PROG= cpp
+#
+# We build cpp(1) as pcpp(1) to avoid confusion with GCC
+#
+
+PROG= pcpp
SRCS= cpy.y
SRCS+= cpp.c token.c
-# avoid conflicts with the GCC cpp.1 page
MAN= pcpp.1
pcpp.1: cpp.1
- cp ${.ALLSRC} ${.TARGET}
+ ${TOOL_SED} -e "s,Nm cpp,Nm pcpp," \
+ -e "s,Dt CPP,Dt PCPP," \
+ ${.ALLSRC} > ${.TARGET}
CPPFLAGS+= -DCPP_DEBUG
CPPFLAGS+= -I${.OBJDIR}
