Module Name: src
Committed By: matt
Date: Tue Nov 20 18:54:42 UTC 2012
Modified Files:
src/tools/binutils [matt-nb6-plus]: Makefile
src/tools/dbsym [matt-nb6-plus]: Makefile
src/tools/gdb [matt-nb6-plus]: Makefile
src/tools/mdsetimage [matt-nb6-plus]: Makefile
Log Message:
Support building GPL2 versions of binutils, dbsym, gdb, and mdsetimage
To generate a diff of this commit:
cvs rdiff -u -r1.21.4.1 -r1.21.4.1.2.1 src/tools/binutils/Makefile
cvs rdiff -u -r1.7 -r1.7.6.1 src/tools/dbsym/Makefile
cvs rdiff -u -r1.21 -r1.21.4.1 src/tools/gdb/Makefile
cvs rdiff -u -r1.9 -r1.9.6.1 src/tools/mdsetimage/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/binutils/Makefile
diff -u src/tools/binutils/Makefile:1.21.4.1 src/tools/binutils/Makefile:1.21.4.1.2.1
--- src/tools/binutils/Makefile:1.21.4.1 Mon May 7 03:08:35 2012
+++ src/tools/binutils/Makefile Tue Nov 20 18:54:42 2012
@@ -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}-," \
Index: src/tools/dbsym/Makefile
diff -u src/tools/dbsym/Makefile:1.7 src/tools/dbsym/Makefile:1.7.6.1
--- src/tools/dbsym/Makefile:1.7 Mon Oct 31 08:14:44 2011
+++ src/tools/dbsym/Makefile Tue Nov 20 18:54:42 2012
@@ -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 @@ NOMAN= # defined
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
Index: src/tools/gdb/Makefile
diff -u src/tools/gdb/Makefile:1.21 src/tools/gdb/Makefile:1.21.4.1
--- src/tools/gdb/Makefile:1.21 Thu Feb 9 15:15:58 2012
+++ src/tools/gdb/Makefile Tue Nov 20 18:54:42 2012
@@ -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 \)
Index: src/tools/mdsetimage/Makefile
diff -u src/tools/mdsetimage/Makefile:1.9 src/tools/mdsetimage/Makefile:1.9.6.1
--- src/tools/mdsetimage/Makefile:1.9 Mon Oct 31 08:14:44 2011
+++ src/tools/mdsetimage/Makefile Tue Nov 20 18:54:42 2012
@@ -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 @@ NOMAN= # defined
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
