Module Name: src
Committed By: mrg
Date: Thu May 29 07:40:37 UTC 2014
Modified Files:
src/external/gpl3/gcc/usr.bin: Makefile.inc
src/tools/gcc: Makefile
Added Files:
src/tools/gcc: gcc-version.mk
Log Message:
commonize the netbsd local version string. (the native one wasn't
updated, and now that won't be a problem again.)
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/external/gpl3/gcc/usr.bin/Makefile.inc
cvs rdiff -u -r1.68 -r1.69 src/tools/gcc/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/gcc/gcc-version.mk
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.21 src/external/gpl3/gcc/usr.bin/Makefile.inc:1.22
--- src/external/gpl3/gcc/usr.bin/Makefile.inc:1.21 Sun Mar 9 17:06:30 2014
+++ src/external/gpl3/gcc/usr.bin/Makefile.inc Thu May 29 07:40:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.21 2014/03/09 17:06:30 martin Exp $
+# $NetBSD: Makefile.inc,v 1.22 2014/05/29 07:40:37 mrg Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1
@@ -63,10 +63,12 @@ DATESTAMPSTR= "\" $(DATESTAMP)\""
DATESTAMPSTR= "\"\""
.endif
+.include "${TOP}/tools/gcc/gcc-version.mk"
+
# XXX pull this out of our configs
G_BUGURL=<http://www.NetBSD.org/Misc/send-pr.html>
G_BUGURL_s="\"${G_BUGURL}\""
-G_PKGVERSION=(NetBSD nb2 20140304)
+G_PKGVERSION=(${NETBSD_GCC_VERSION})
G_PKGVERSION_s="\"${G_PKGVERSION} \""
VER_CPPFLAGS= -DBASEVER="\"${BASEVER}"\" \
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.68 src/tools/gcc/Makefile:1.69
--- src/tools/gcc/Makefile:1.68 Wed May 28 07:32:22 2014
+++ src/tools/gcc/Makefile Thu May 29 07:40:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2014/05/28 07:32:22 mrg Exp $
+# $NetBSD: Makefile,v 1.69 2014/05/29 07:40:37 mrg Exp $
.include <bsd.own.mk>
@@ -35,11 +35,13 @@ MULTILIB_ARGS= --disable-multilib
SOFTFLOAT_ARGS= -with-float=soft
.endif
+.include "gcc-version.mk"
+
COMMON_CONFIGURE_ARGS= --target=${MACHINE_GNU_PLATFORM} \
--enable-long-long \
--enable-threads \
--with-bugurl=http://www.NetBSD.org/Misc/send-pr.html \
- --with-pkgversion="NetBSD nb1 20140527" \
+ --with-pkgversion="NetBSD ${NETBSD_GCC_VERSION}" \
--with-system-zlib \
--enable-__cxa_atexit \
--enable-libstdcxx-threads
Added files:
Index: src/tools/gcc/gcc-version.mk
diff -u /dev/null src/tools/gcc/gcc-version.mk:1.1
--- /dev/null Thu May 29 07:40:37 2014
+++ src/tools/gcc/gcc-version.mk Thu May 29 07:40:37 2014
@@ -0,0 +1,5 @@
+# $NetBSD: gcc-version.mk,v 1.1 2014/05/29 07:40:37 mrg Exp $
+
+# common location for tools and native build
+
+NETBSD_GCC_VERSION=nb1 20140527
