Module Name: src
Committed By: mrg
Date: Fri Jul 1 10:03:17 UTC 2011
Modified Files:
src/external/gpl3/gcc/usr.bin: Makefile.inc
Log Message:
fix version.c defines. now the version says:
gcc version 4.5.3 (NetBSD nb1 20110620)
instead of:
gcc version 4.5.320110428
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/usr.bin/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/usr.bin/Makefile.inc
diff -u src/external/gpl3/gcc/usr.bin/Makefile.inc:1.7 src/external/gpl3/gcc/usr.bin/Makefile.inc:1.8
--- src/external/gpl3/gcc/usr.bin/Makefile.inc:1.7 Wed Jun 29 02:15:13 2011
+++ src/external/gpl3/gcc/usr.bin/Makefile.inc Fri Jul 1 10:03:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2011/06/29 02:15:13 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.8 2011/07/01 10:03:17 mrg Exp $
.include <bsd.own.mk>
@@ -31,7 +31,11 @@
# XXX
#DEVPHASE!= cat ${GNUHOSTDIST}/gcc/DEV-PHASE
DEVPHASE=
+.if ${DEVPHASE} == "release" || ${DEVPHASE} == ""
+DATESTAMP=
+.else
DATESTAMP!= cat ${GNUHOSTDIST}/gcc/DATESTAMP
+.endif
BASEVERSTR= "\"$(BASEVER)\""
.if !empty(DEVPHASE)
@@ -39,7 +43,7 @@
.else
DEVPHASESTR= "\"\""
.endif
-.if !empty(DEVPHASE)
+.if !empty(DATESTAMP)
DATESTAMPSTR= "\" $(DATESTAMP)\""
.else
DATESTAMPSTR= "\"\""
@@ -48,13 +52,13 @@
# XXX pull this out of our configs
G_BUGURL=<http://www.NetBSD.org/Misc/send-pr.html>
G_BUGURL_s="\"${G_BUG_URL}\""
-G_PKGVERSION_s=(NetBSD nb1 20110620)
+G_PKGVERSION=(NetBSD nb1 20110620)
G_PKGVERSION_s="\"${G_PKGVERSION} \""
VER_CPPFLAGS= -DBUGURL=${G_BUGURL_s} \
-DPKGVERSION=${G_PKGVERSION_s} \
-DBASEVER="\"${BASEVER}"\" \
- -DDATESTAMP="\"${DATESTAMP}"\" \
+ -DDATESTAMP=${DATESTAMPSTR} \
-DDEVPHASE=${DEVPHASE} \
-DREVISION=${REVISION}
CPPFLAGS.version.c= ${VER_CPPFLAGS}
