diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-08-18 03:57:51 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-08-18 03:57:51 +0000 |
| commit | e469c736e488db2e5fd82d4f67418bcf458d172f (patch) | |
| tree | 578124d13d1eb9bf4a6ff618a484998e0741b303 /sys-devel/binutils-config | |
| parent | add prefix support (bug #430098) (diff) | |
| download | gentoo-2-e469c736e488db2e5fd82d4f67418bcf458d172f.tar.gz gentoo-2-e469c736e488db2e5fd82d4f67418bcf458d172f.tar.bz2 gentoo-2-e469c736e488db2e5fd82d4f67418bcf458d172f.zip | |
Fix relative ROOT handling #431104 by Greg Turner.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'sys-devel/binutils-config')
| -rw-r--r-- | sys-devel/binutils-config/ChangeLog | 5 | ||||
| -rwxr-xr-x | sys-devel/binutils-config/files/binutils-config-3 | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sys-devel/binutils-config/ChangeLog b/sys-devel/binutils-config/ChangeLog index ed37f71798a9..949b67108995 100644 --- a/sys-devel/binutils-config/ChangeLog +++ b/sys-devel/binutils-config/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-devel/binutils-config # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.61 2012/07/29 18:36:13 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.62 2012/08/18 03:57:51 vapier Exp $ + + 18 Aug 2012; Mike Frysinger <vapier@gentoo.org> files/binutils-config-3: + Fix relative ROOT handling #431104 by Greg Turner. 29 Jul 2012; Raúl Porcel <armin76@gentoo.org> binutils-config-3-r3.ebuild: alpha/ia64/m68k/s390/sh/sparc stable wrt #420355 diff --git a/sys-devel/binutils-config/files/binutils-config-3 b/sys-devel/binutils-config/files/binutils-config-3 index 78972bb09cfd..e84cf2796b3f 100755 --- a/sys-devel/binutils-config/files/binutils-config-3 +++ b/sys-devel/binutils-config/files/binutils-config-3 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2012 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-3,v 1.8 2012/03/02 23:12:09 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.9 2012/08/18 03:57:50 vapier Exp $ # Format of /etc/env.d/binutils/: # config-TARGET: CURRENT=version for TARGET @@ -9,7 +9,7 @@ : ${ROOT:=/} [[ ${ROOT} != */ ]] && ROOT="${ROOT}/" -[[ ${ROOT} != /* ]] && ROOT="${PWD}${ROOT}" +[[ ${ROOT} != /* ]] && ROOT="${PWD%/}/${ROOT}" cd / @@ -411,7 +411,7 @@ while [[ $# -gt 0 ]] ; do -h|--help) usage 0 ;; -V|--version) unset Header - cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.8 2012/03/02 23:12:09 vapier Exp $" + cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.9 2012/08/18 03:57:50 vapier Exp $" cvsver=${cvsver##*binutils-config-} bver=${cvsver%%,v *} cvsver=${cvsver#* } |