[src/matt-nb6-plus]: src/tools Support building GPL2 versions of binutils, db...

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

details:   https://anonhg.NetBSD.org/src/rev/071757536aeb
branches:  matt-nb6-plus
changeset: 774489:071757536aeb
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Nov 20 18:54:42 2012 +0000

description:
Support building GPL2 versions of binutils, dbsym, gdb, and mdsetimage

diffstat:

 tools/binutils/Makefile   |  6 +++++-
 tools/dbsym/Makefile      |  6 +++++-
 tools/gdb/Makefile        |  6 +++++-
 tools/mdsetimage/Makefile |  6 +++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diffs (84 lines):

diff -r a8e135d47c1d -r 071757536aeb tools/binutils/Makefile
--- a/tools/binutils/Makefile   Tue Nov 20 18:49:14 2012 +0000
+++ b/tools/binutils/Makefile   Tue Nov 20 18:54:42 2012 +0000
@@ -1,15 +1,19 @@
-#      $NetBSD: Makefile,v 1.21.4.1 2012/05/07 03:08:35 riz Exp $
+#      $NetBSD: Makefile,v 1.21.4.1.2.1 2012/11/20 18:54:42 matt Exp $
 
 .include <bsd.own.mk>
 
 MODULE=                binutils
 
+.if $(HAVE_BINUTILS) == "219"
 GNUHOSTDIST=   ${.CURDIR}/../../external/gpl3/binutils/dist
 
 BRANDING?=     \
        --with-pkgversion="NetBSD Binutils nb1" \
        --with-bugurl="http://www.NetBSD.org/support/send-pr.html"; \
        --with-lib-path="=/usr/lib" --with-sysroot
+.else
+BRANDING?=     
+.endif
 
 CONFIGURE_ARGS=        --target=${MACHINE_GNU_PLATFORM} --disable-nls \
                --program-transform-name="s,^,${MACHINE_GNU_PLATFORM}-," \
diff -r a8e135d47c1d -r 071757536aeb tools/dbsym/Makefile
--- a/tools/dbsym/Makefile      Tue Nov 20 18:49:14 2012 +0000
+++ b/tools/dbsym/Makefile      Tue Nov 20 18:54:42 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2011/10/31 08:14:44 mrg Exp $
+#      $NetBSD: Makefile,v 1.7.6.1 2012/11/20 18:54:42 matt Exp $
 
 NOMAN= # defined
 
@@ -6,7 +6,11 @@
 
 HOSTPROGNAME=  ${MACHINE_GNU_PLATFORM}-dbsym
 
+.if $(HAVE_BINUTILS) == "219"
 HOST_SRCDIR=    external/gpl3/binutils/usr.sbin/dbsym
+.else
+HOST_SRCDIR=   gnu/usr.sbin/dbsym
+.endif
 
 TOOLCHAINOBJ!= cd ${.CURDIR}/../binutils && ${PRINTOBJDIR}
 BFDDIR=                ${TOOLCHAINOBJ}/build/bfd
diff -r a8e135d47c1d -r 071757536aeb tools/gdb/Makefile
--- a/tools/gdb/Makefile        Tue Nov 20 18:49:14 2012 +0000
+++ b/tools/gdb/Makefile        Tue Nov 20 18:54:42 2012 +0000
@@ -1,9 +1,13 @@
-#      $NetBSD: Makefile,v 1.21 2012/02/09 15:15:58 skrll Exp $
+#      $NetBSD: Makefile,v 1.21.4.1 2012/11/20 18:54:42 matt Exp $
 
 .include <bsd.own.mk>
 
+.if ${HAVE_GDB} == "6"
+MODULE=                gdb6
+.else
 MODULE=                gdb
 GNUHOSTDIST=    ${.CURDIR}/../../external/gpl3/gdb/dist
+.endif
 
 FIND_ARGS=     \! \( -type d -name sim -prune \)
 
diff -r a8e135d47c1d -r 071757536aeb tools/mdsetimage/Makefile
--- a/tools/mdsetimage/Makefile Tue Nov 20 18:49:14 2012 +0000
+++ b/tools/mdsetimage/Makefile Tue Nov 20 18:54:42 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2011/10/31 08:14:44 mrg Exp $
+#      $NetBSD: Makefile,v 1.9.6.1 2012/11/20 18:54:42 matt Exp $
 
 NOMAN= # defined
 
@@ -6,7 +6,11 @@
 
 HOSTPROGNAME=  ${MACHINE_GNU_PLATFORM}-mdsetimage
 
+.if $(HAVE_BINUTILS) == "219"
 HOST_SRCDIR=   external/gpl3/binutils/usr.sbin/mdsetimage
+.else
+HOST_SRCDIR=   gnu/usr.sbin/mdsetimage
+.endif
 
 TOOLCHAINOBJ!= cd ${.CURDIR}/../binutils && ${PRINTOBJDIR}
 BFDDIR=                ${TOOLCHAINOBJ}/build/bfd