From: Fabian Groffen <grobian@gentoo.org>
Date: Fri, 2 Dec 2011 17:57:15 +0000 (+0100)
Subject: save_elf_debug: take offset into account
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=521d0f4a535c98867a8ed88f174cb2c74f57bb93;p=portage.git

save_elf_debug: take offset into account

For bug #392609, use ED in more places not to get out of prefix links.
---

diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip
index 077656f52..0305f0a3a 100755
--- a/bin/ebuild-helpers/prepstrip
+++ b/bin/ebuild-helpers/prepstrip
@@ -108,7 +108,7 @@ save_elf_debug() {
 
 	local inode=$(inode_var_name "$x")
 	if [[ -n ${!inode} ]] ; then
-		ln "${D}usr/lib/debug/${!inode:${#D}}.debug" "$y"
+		ln "${ED}usr/lib/debug/${!inode:${#D}}.debug" "$y"
 	else
 		eval $inode=\$x
 		if [[ -e ${T}/prepstrip.split.debug ]] ; then
@@ -129,7 +129,7 @@ save_elf_debug() {
 			| awk '$NF ~ /GNU/ { getline; printf $2$3$4$5; getline; print $2 }')
 	fi
 	if [[ -n ${buildid} ]] ; then
-		local buildid_dir="${D}usr/lib/debug/.build-id/${buildid:0:2}"
+		local buildid_dir="${ED}usr/lib/debug/.build-id/${buildid:0:2}"
 		local buildid_file="${buildid_dir}/${buildid:2}"
 		mkdir -p "${buildid_dir}"
 		ln -s "../../${x:${#D}}.debug" "${buildid_file}.debug"