[src/trunk]: src commonize the netbsd local version string. (the native one ...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/74b14fa90bec
branches:  trunk
changeset: 329561:74b14fa90bec
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu May 29 07:40:37 2014 +0000

description:
commonize the netbsd local version string.  (the native one wasn't
updated, and now that won't be a problem again.)

diffstat:

 external/gpl3/gcc/usr.bin/Makefile.inc |  6 ++++--
 tools/gcc/Makefile                     |  6 ++++--
 tools/gcc/gcc-version.mk               |  5 +++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diffs (56 lines):

diff -r e89a0178c2f5 -r 74b14fa90bec external/gpl3/gcc/usr.bin/Makefile.inc
--- a/external/gpl3/gcc/usr.bin/Makefile.inc    Thu May 29 07:08:10 2014 +0000
+++ b/external/gpl3/gcc/usr.bin/Makefile.inc    Thu May 29 07:40:37 2014 +0000
@@ -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=          "\"\""
 .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}"\" \
diff -r e89a0178c2f5 -r 74b14fa90bec tools/gcc/Makefile
--- a/tools/gcc/Makefile        Thu May 29 07:08:10 2014 +0000
+++ b/tools/gcc/Makefile        Thu May 29 07:40:37 2014 +0000
@@ -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 @@
 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
diff -r e89a0178c2f5 -r 74b14fa90bec tools/gcc/gcc-version.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/gcc/gcc-version.mk  Thu May 29 07:40:37 2014 +0000
@@ -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