summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-05-18 08:59:17 +0000
committerZac Medico <zmedico@gentoo.org>2006-05-18 08:59:17 +0000
commit7761e1d6c412822e4f8bc2fdbf4f293b66fe7923 (patch)
treee491e1a7129f7e1dc50332764d9bd8591be12b80
parent5afa328e855bd12c8271fe592ce51ba305a8d0a4 (diff)
downloadportage-7761e1d6c412822e4f8bc2fdbf4f293b66fe7923.tar.gz
portage-7761e1d6c412822e4f8bc2fdbf4f293b66fe7923.tar.bz2
portage-7761e1d6c412822e4f8bc2fdbf4f293b66fe7923.zip
Fix prepstrip split-debug paths for bug #133628. Thanks to kevquinn for this patch.
svn path=/main/trunk/; revision=3373
-rwxr-xr-xbin/prepstrip8
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/prepstrip b/bin/prepstrip
index 0a296b348..bfee45524 100755
--- a/bin/prepstrip
+++ b/bin/prepstrip
@@ -22,7 +22,7 @@ banner=1
save_elf_debug() {
local x=$1
- local y="${D}usr/lib/debug/${x:${#D}+1}.debug"
+ local y="${D}usr/lib/debug/${x:${#D}}.debug"
hasq splitdebug ${FEATURES} || return 0
@@ -45,7 +45,7 @@ save_elf_debug() {
fi
}
-for x in $(scanelf -yRBF%F "$@") $(for y in "$@"; do find "${y}" -type f -name '*.a' -print0 ; done); do
+for x in $(scanelf -yRBF%F "$@") $(for y in "$@"; do find "${y}" -type f -name '*.a' -print ; done); do
if [[ ${banner} -eq 1 ]] ; then
vecho "strip: ${STRIP} ${PORTAGE_STRIP_FLAGS}"
banner=0
@@ -65,11 +65,11 @@ for x in $(scanelf -yRBF%F "$@") $(for y in "$@"; do find "${y}" -type f -name '
set +o noglob
if [[ ${f} == *"current ar archive"* ]] ; then
- vecho " ${x:${#D}+1}"
+ vecho " ${x:${#D}}"
[[ ${stripitbaby} -eq 1 ]] && ${STRIP} -g "${x}"
fi
if [[ ${f} == *"SB executable"* || ${f} == *"SB shared object"* ]] ; then
- vecho " ${x:${#D}+1}"
+ vecho " ${x:${#D}}"
save_elf_debug "${x}"
[[ ${stripitbaby} -eq 1 ]] && ${STRIP} ${PORTAGE_STRIP_FLAGS} "${x}"
fi