Module Name: src
Committed By: mrg
Date: Tue Jun 28 09:28:22 UTC 2011
Modified Files:
src/external/gpl3/gcc/usr.bin: Makefile.inc
Log Message:
- add LIBDECNUMBEROBJ.
- update the VER_CPPFLAGS for GCC 4.5.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 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.4 src/external/gpl3/gcc/usr.bin/Makefile.inc:1.5
--- src/external/gpl3/gcc/usr.bin/Makefile.inc:1.4 Tue Jun 28 04:22:17 2011
+++ src/external/gpl3/gcc/usr.bin/Makefile.inc Tue Jun 28 09:28:22 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2011/06/28 04:22:17 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.5 2011/06/28 09:28:22 mrg Exp $
.include <bsd.own.mk>
@@ -22,6 +22,7 @@
FRONTENDOBJ!= cd ${.CURDIR}/../frontend && ${PRINTOBJDIR}
BACKENDOBJ!= cd ${.CURDIR}/../backend && ${PRINTOBJDIR}
LIBCPPOBJ!= cd ${.CURDIR}/../libcpp && ${PRINTOBJDIR}
+LIBDECNUMBEROBJ!= cd ${.CURDIR}/../../lib/libdecnumber && ${PRINTOBJDIR}
HOSTLIBIBERTYOBJ!= cd ${.CURDIR}/../host-libiberty && ${PRINTOBJDIR}
HOSTLIBIBERTY= ${HOSTLIBIBERTYOBJ}/libiberty/libiberty.a
@@ -44,9 +45,16 @@
DATESTAMPSTR= "\"\""
.endif
-VER_CPPFLAGS= -DBASEVER=${BASEVERSTR} \
- -DDATESTAMP=${DATESTAMPSTR} \
- -DDEVPHASE=${DEVPHASESTR}
+# XXX pull this out of our configs
+G_BUGURL_s="\"<http://www.NetBSD.org/Misc/send-pr.html>\""
+G_PKGVERSION_s="\"(NetBSD nb1 20110620) \""
+
+VER_CPPFLAGS= -DBUGURL=${G_BUGURL_s} \
+ -DPKGVERSION=${G_PKGVERSION_s} \
+ -DBASEVER="\"${BASEVER}"\" \
+ -DDATESTAMP="\"${DATESTAMP}"\" \
+ -DDEVPHASE=${DEVPHASE} \
+ -DREVISION=${REVISION}
CPPFLAGS.version.c= ${VER_CPPFLAGS}
.include "${GCCARCH}/defs.mk"
