Symlink ldscripts into gcc-exec path #147155 by Heiko Rosemann.

Package-Manager: portage-2.1.1

4 files changed, 32 insertions, 5 deletions

diff --git a/sys-devel/binutils-config/ChangeLog b/sys-devel/binutils-config/ChangeLog
index 102de711d9ee..8266ca4b96cc 100644
--- a/sys-devel/binutils-config/ChangeLog
+++ b/sys-devel/binutils-config/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/binutils-config
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.22 2006/08/27 18:03:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.23 2006/09/17 07:25:08 vapier Exp $
+
+*binutils-config-1.9-r2 (17 Sep 2006)
+
+  17 Sep 2006; Mike Frysinger <vapier@gentoo.org> files/binutils-config-1.9,
+  -binutils-config-1.9-r1.ebuild, +binutils-config-1.9-r2.ebuild:
+  Symlink ldscripts into gcc-exec path #147155 by Heiko Rosemann.
 
 *binutils-config-1.9-r1 (27 Aug 2006)
 
diff --git a/sys-devel/binutils-config/binutils-config-1.9-r2.ebuild b/sys-devel/binutils-config/binutils-config-1.9-r2.ebuild
new file mode 100644
index 000000000000..f4af159fefa6
--- /dev/null
+++ b/sys-devel/binutils-config/binutils-config-1.9-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/binutils-config-1.9-r2.ebuild,v 1.1 2006/09/17 07:25:08 vapier Exp $
+
+DESCRIPTION="Utility to change the binutils version being used"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+
+src_install() {
+	newbin "${FILESDIR}"/${PN}-${PV} ${PN} || die
+	doman "${FILESDIR}"/${PN}.8
+}
diff --git a/sys-devel/binutils-config/files/binutils-config-1.9 b/sys-devel/binutils-config/files/binutils-config-1.9
index 7dcbc43f573c..ddfde6b3f5dd 100755
--- a/sys-devel/binutils-config/files/binutils-config-1.9
+++ b/sys-devel/binutils-config/files/binutils-config-1.9
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.9,v 1.3 2006/08/27 21:43:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.9,v 1.4 2006/09/17 07:25:08 vapier Exp $
 
 # Format of /etc/env.d/binutils/:
 #  config-TARGET:	CURRENT=version for TARGET
@@ -82,6 +82,7 @@ switch_profile() {
 	# extra set of binary names (${FAKE_TARGETS})
 	#
 	BINPATH=""
+	BINPATH_LINKS=""
 	if [[ ${TARGET} != ${HOST} ]] ; then
 		#
 		# Newer paths: /usr/${HOST}/${TARGET}/...
@@ -124,10 +125,10 @@ switch_profile() {
 		rmdir "${ROOT}"/usr/${TARGET}/lib >& /dev/null
 	fi
 	# When upgrading, we need to clean up ldscripts and libs
-	rm -rf "${dstlib}/ldscripts"
+	rm -rf "${dstlib}/ldscripts" "${BINPATH_LINKS}"/ldscripts
+	ln -sf "${LIBPATH}/ldscripts" "${BINPATH_LINKS}/ldscripts"
 	mkdir -p "${dstlib}"
 	find "${dstlib}" -xtype l -exec rm {} \;
-	ln -sf "${LIBPATH}/ldscripts" "${dstlib}/ldscripts"
 	for x in lib* ; do
 		ln -sf "${LIBPATH}/${x}" "${dstlib}/${x}"
 	done
@@ -331,7 +332,7 @@ while [[ $# -gt 0 ]] ; do
 			exit 0
 			;;
 		-V|--version)
-			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.9,v 1.3 2006/08/27 21:43:54 vapier Exp $"
+			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.9,v 1.4 2006/09/17 07:25:08 vapier Exp $"
 			cvsver=${cvsver##*binutils-config-}
 			bver=${cvsver%%,v *}
 			cvsver=${cvsver#* }
diff --git a/sys-devel/binutils-config/files/digest-binutils-config-1.9-r2 b/sys-devel/binutils-config/files/digest-binutils-config-1.9-r2
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/sys-devel/binutils-config/files/digest-binutils-config-1.9-r2
@@ -0,0 +1 @@
+