From 931b340224c66e6470394e23b9af57391b747927 Mon Sep 17 00:00:00 2001
From: Simon Schubert <corecode@dragonflybsd.org>
Date: Fri, 13 Apr 2007 12:26:42 +0000
Subject: [PATCH] Hook binutils-2.17 into the build.

---
 Makefile.inc1          |  4 ++--
 etc/mtree/BSD.usr.dist |  8 +++++++-
 gnu/usr.bin/Makefile   | 10 +++++-----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 90af92bf5d..6836b3858a 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1,6 +1,6 @@
 #
 # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $
-# $DragonFly: src/Makefile.inc1,v 1.102 2007/02/18 23:46:10 corecode Exp $
+# $DragonFly: src/Makefile.inc1,v 1.103 2007/04/13 12:26:42 corecode Exp $
 #
 # Build-time options are documented in make.conf(5).
 #
@@ -816,7 +816,7 @@ _gcc34_tools= gnu/usr.bin/cc34/cc_prep gnu/usr.bin/cc34/cc_tools
 _gcc41_cross= gnu/usr.bin/cc41
 _gcc41_tools= gnu/usr.bin/cc41/cc_prep gnu/usr.bin/cc41/cc_tools
 .endif
-_binutils= gnu/usr.bin/binutils215
+_binutils= gnu/usr.bin/binutils215 gnu/usr.bin/binutils217
 
 .if !defined(NO_FORTRAN)
 _fortran= gnu/usr.bin/cc34/f771
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 641682a665..b8be9fb97a 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -1,5 +1,5 @@
 # $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.188.2.40 2003/02/14 22:38:14 nectar Exp $
-# $DragonFly: src/etc/mtree/BSD.usr.dist,v 1.46 2007/01/15 18:23:24 corecode Exp $
+# $DragonFly: src/etc/mtree/BSD.usr.dist,v 1.47 2007/04/13 12:26:42 corecode Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -75,6 +75,12 @@
 	    elf
 	    ..
 	..
+	binutils217
+	    ldscripts
+	    ..
+	    elf
+	    ..
+	..
 	gcc34
 	..
 	gcc41
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index c34b315385..8e50ea0c9e 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/gnu/usr.bin/Makefile,v 1.51 2000/01/16 00:11:34 obrien Exp $
-# $DragonFly: src/gnu/usr.bin/Makefile,v 1.27 2007/02/18 23:46:10 corecode Exp $
+# $DragonFly: src/gnu/usr.bin/Makefile,v 1.28 2007/04/13 12:26:42 corecode Exp $
 
 SUBDIR= cpio dialog diff diff3 grep groff man rcs sdiff sort texinfo
 
@@ -11,12 +11,12 @@ SUBDIR+=cvs
 SUBDIR+=gdb
 .endif
 
-SUBDIR+= binutils215 cc34
-.ORDER: binutils215 cc34
+SUBDIR+= binutils215 binutils217 cc34
+.ORDER: binutils215 binutils217 cc34
 
 .if !defined(NO_GCC41)
-SUBDIR+= binutils215 cc41
-.ORDER: binutils215 cc41
+SUBDIR+= binutils215 binutils217 cc41
+.ORDER: binutils215 binutils217 cc41
 .endif
 
 .include <bsd.subdir.mk>
-- 
2.41.0