X-Git-Url: https://hackdaworld.org/gitweb/?p=hdw-linux%2Fhdw-linux.git;a=blobdiff_plain;f=packages%2Fbase%2Fbinutils%2Fbinutils;fp=packages%2Fbase%2Fbinutils%2Fbinutils;h=27d094691df44a64aeb720b8e8d2abffa5d643a8;hp=b79e23390f239c07c93020ea91efd245fd273d09;hb=504579d0d381b02fc33fe1c696d64f96135a15a8;hpb=c7b7c7d4ce2f5a6947e42ff37d9584d26eb52ba4

diff --git a/packages/base/binutils/binutils b/packages/base/binutils/binutils
index b79e233..27d0946 100644
--- a/packages/base/binutils/binutils
+++ b/packages/base/binutils/binutils
@@ -2,41 +2,47 @@
 
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 2.16.91.0.1
+# [V] 2.17
 # [S] 2-4 2-5
-# [D] binutils-2.16.91.0.1.tar.bz2 http://ftp.kernel.org/pub/linux/devel/binutils/
+# [D] binutils-2.17.tar.bz2 http://ftp.gnu.org/gnu/binutils/
 
 libpath="/usr/lib:/lib"
 
 if [ "$priority" = "4" ] ; then
-	flist_path="$flist_path ${s1_prefix}/"
+	flist_path="$flist_path ${tc_name}/"
 	flist_pruned="$flist_pruned|specs"
 	custmain=1
 	custmain()	{
-		# install binutils linking against new libc
-		cd $root/tmp/src.binutils/binutils-build
-		make -C ld INSTALL=/${s1_prefix}/bin/install install
-		cd -
-		rm -rf $root/tmp/src.binutils
+		install ld linking against new libc
+		mv -v /${tc_name}/bin/{ld,ld-old}
+		mv -v /${tc_name}/`gcc -dumpmachine`/bin/{ld,ld-old}
+		mv -v /${tc_name}/bin/{ld-new,ld}
+		ln -sv /${tc_name}/bin/ld /tools/`gcc -dumpmachine`/bin/ld
 
 		# show new linker to gcc
-		cr="" ; [ "$hdw_crossbuild" != "0" ] && cr=/${s1_prefix}
-		SPECFILE="`gcc --print-file specs`"
-	sed -e "s@ /${s1_prefix}/lib/ld-linux.so.2@ $cr/lib/ld-linux.so.2@g" \
-	    -e "s@ /${s1_prefix}/lib/ld.so.1@ $cr/lib/ld.so.1@g" \
-			$SPECFILE > tempspecfile
-		mv tempspecfile $SPECFILE
+		SPECFILE="`gcc --print-libgcc-file-name`"
+		SPECFILE="`dirname $SPECFILE`/specs"
+		gcc -dumpspecs | \
+	sed -e "s@ /${tc_name}/lib/ld-linux.so.2@ /lib/ld-linux.so.2@g" \
+	    -e "s@ /${tc_name}/lib/ld.so.1@ /lib/ld.so.1@g" \
+	    -e "s@\*startfile_prefix_spec:@& /usr/lib@g" > $SPECFILE
+
+		INCDIR="`dirname $SPECFILE`/include"
 		unset SPECFILE
+
+		# remove fixed includes from gcc's private include dir
+		find $INCDIR/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \;
+		rm -vf `grep -l "DO NOT EDIT THIS FILE" $INCDIR/*`
+		unset INCDIR
 			}
 fi
 
 if [ "$priority" = "5" ] ; then
-	confopt="$confopt --enable-shared --disable-nls"
+	confopt="$confopt --enable-shared" # no --disable-nls
 	make_conf="tooldir=$root/usr"
 	install_conf="tooldir=$root/usr"
 	post_install()	{
-		cp ../binutils-$ver/include/libiberty.h \
-				$prefix/include
+		cp -v ../binutils-$ver/include/libiberty.h $prefix/include
 			}
 
 	build_main()	{