| 1 |
commit: 521d0f4a535c98867a8ed88f174cb2c74f57bb93 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 2 17:57:15 2011 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 2 17:57:15 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=521d0f4a |
| 7 |
|
| 8 |
save_elf_debug: take offset into account |
| 9 |
|
| 10 |
For bug #392609, use ED in more places not to get out of prefix links. |
| 11 |
|
| 12 |
--- |
| 13 |
bin/ebuild-helpers/prepstrip | 4 ++-- |
| 14 |
1 files changed, 2 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip |
| 17 |
index 077656f..0305f0a 100755 |
| 18 |
--- a/bin/ebuild-helpers/prepstrip |
| 19 |
+++ b/bin/ebuild-helpers/prepstrip |
| 20 |
@@ -108,7 +108,7 @@ save_elf_debug() { |
| 21 |
|
| 22 |
local inode=$(inode_var_name "$x") |
| 23 |
if [[ -n ${!inode} ]] ; then |
| 24 |
- ln "${D}usr/lib/debug/${!inode:${#D}}.debug" "$y" |
| 25 |
+ ln "${ED}usr/lib/debug/${!inode:${#D}}.debug" "$y" |
| 26 |
else |
| 27 |
eval $inode=\$x |
| 28 |
if [[ -e ${T}/prepstrip.split.debug ]] ; then |
| 29 |
@@ -129,7 +129,7 @@ save_elf_debug() { |
| 30 |
| awk '$NF ~ /GNU/ { getline; printf $2$3$4$5; getline; print $2 }') |
| 31 |
fi |
| 32 |
if [[ -n ${buildid} ]] ; then |
| 33 |
- local buildid_dir="${D}usr/lib/debug/.build-id/${buildid:0:2}" |
| 34 |
+ local buildid_dir="${ED}usr/lib/debug/.build-id/${buildid:0:2}" |
| 35 |
local buildid_file="${buildid_dir}/${buildid:2}" |
| 36 |
mkdir -p "${buildid_dir}" |
| 37 |
ln -s "../../${x:${#D}}.debug" "${buildid_file}.debug" |
Archives