Module Name: src
Committed By: matt
Date: Wed Nov 21 01:04:34 UTC 2012
Modified Files:
src/external [matt-nb6-plus]: Makefile
src/external/gpl3 [matt-nb6-plus]: Makefile
Log Message:
Don't descend into gpl3 unless we are building a gpl3 tool.
Only build binutils if we want 2.19 [sic]
To generate a diff of this commit:
cvs rdiff -u -r1.16.6.1 -r1.16.6.1.2.1 src/external/Makefile
cvs rdiff -u -r1.6 -r1.6.6.1 src/external/gpl3/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/Makefile
diff -u src/external/Makefile:1.16.6.1 src/external/Makefile:1.16.6.1.2.1
--- src/external/Makefile:1.16.6.1 Mon Aug 13 23:18:23 2012
+++ src/external/Makefile Wed Nov 21 01:04:33 2012
@@ -1,6 +1,11 @@
-# $NetBSD: Makefile,v 1.16.6.1 2012/08/13 23:18:23 riz Exp $
+# $NetBSD: Makefile,v 1.16.6.1.2.1 2012/11/21 01:04:33 matt Exp $
-SUBDIR+= apache2 atheros bsd intel-fw-eula intel-fw-public gpl2 gpl3 historical
-SUBDIR+= ibm-public public-domain cddl mit realtek
+.include <bsd.own.mk>
+
+SUBDIR+= apache2 atheros bsd intel-fw-eula intel-fw-public gpl2
+.if ${HAVE_BINUTILS} == "219" || ${HAVE_GCC} == "45" || ${HAVE_GDB} == "7"
+SUBDIR+= gpl3
+.endif
+SUBDIR+= historical ibm-public public-domain cddl mit realtek
.include <bsd.subdir.mk>
Index: src/external/gpl3/Makefile
diff -u src/external/gpl3/Makefile:1.6 src/external/gpl3/Makefile:1.6.6.1
--- src/external/gpl3/Makefile:1.6 Mon Oct 31 08:14:44 2011
+++ src/external/gpl3/Makefile Wed Nov 21 01:04:34 2012
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.6 2011/10/31 08:14:44 mrg Exp $
+# $NetBSD: Makefile,v 1.6.6.1 2012/11/21 01:04:34 matt Exp $
.include <bsd.own.mk>
.if ${MKBINUTILS} != "no"
+.if ${HAVE_BINUTILS} == "219"
SUBDIR+= binutils
.endif
+.endif
.if ${HAVE_GCC} == 45
.if ${MKGCCCMDS} != "no"
