summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-11-26 13:40:14 +0000
committerMike Frysinger <vapier@gentoo.org>2006-11-26 13:40:14 +0000
commit72633021357b878be94b5ab129a684d46b947028 (patch)
treecbe801e87ad5a45fcd81c067ea5469e0901dd4b5 /sys-devel/binutils-config/files
parentModernize ebuild: use autotools, proper quoting, use emake, fix X dependencies. (diff)
downloadgentoo-2-72633021357b878be94b5ab129a684d46b947028.tar.gz
gentoo-2-72633021357b878be94b5ab129a684d46b947028.tar.bz2
gentoo-2-72633021357b878be94b5ab129a684d46b947028.zip
Fix from James Le Cuirot for handling of $ROOT in ldscript cleanup #156118.
(Portage version: 2.1.2_rc2-r2)
Diffstat (limited to 'sys-devel/binutils-config/files')
-rwxr-xr-xsys-devel/binutils-config/files/binutils-config-1.98
-rw-r--r--sys-devel/binutils-config/files/digest-binutils-config-1.8-r71
-rw-r--r--sys-devel/binutils-config/files/digest-binutils-config-1.9-r30
3 files changed, 4 insertions, 5 deletions
diff --git a/sys-devel/binutils-config/files/binutils-config-1.9 b/sys-devel/binutils-config/files/binutils-config-1.9
index 3894adae441f..a7659d157b5d 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.5 2006/10/19 03:45:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.9,v 1.6 2006/11/26 13:40:14 vapier Exp $
# Format of /etc/env.d/binutils/:
# config-TARGET: CURRENT=version for TARGET
@@ -125,8 +125,8 @@ switch_profile() {
rmdir "${ROOT}"/usr/${TARGET}/lib >& /dev/null
fi
# When upgrading, we need to clean up ldscripts and libs
- rm -rf "${dstlib}/ldscripts" "${BINPATH_LINKS}"/ldscripts
- ln -sf "${LIBPATH}/ldscripts" "${BINPATH_LINKS}/ldscripts"
+ rm -rf "${dstlib}/ldscripts" "${ROOT}/${BINPATH_LINKS}"/ldscripts
+ ln -sf "${LIBPATH}/ldscripts" "${ROOT}/${BINPATH_LINKS}"/ldscripts
mkdir -p "${dstlib}"
find -L "${dstlib}" -type l -exec rm {} \;
for x in lib* ; do
@@ -332,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.5 2006/10/19 03:45:52 vapier Exp $"
+ cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.9,v 1.6 2006/11/26 13:40:14 vapier Exp $"
cvsver=${cvsver##*binutils-config-}
bver=${cvsver%%,v *}
cvsver=${cvsver#* }
diff --git a/sys-devel/binutils-config/files/digest-binutils-config-1.8-r7 b/sys-devel/binutils-config/files/digest-binutils-config-1.8-r7
index 8b137891791f..e69de29bb2d1 100644
--- a/sys-devel/binutils-config/files/digest-binutils-config-1.8-r7
+++ b/sys-devel/binutils-config/files/digest-binutils-config-1.8-r7
@@ -1 +0,0 @@
-
diff --git a/sys-devel/binutils-config/files/digest-binutils-config-1.9-r3 b/sys-devel/binutils-config/files/digest-binutils-config-1.9-r3
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-devel/binutils-config/files/digest-binutils-config-1.9-r3