From 7761e1d6c412822e4f8bc2fdbf4f293b66fe7923 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 18 May 2006 08:59:17 +0000 Subject: Fix prepstrip split-debug paths for bug #133628. Thanks to kevquinn for this patch. svn path=/main/trunk/; revision=3373 --- bin/prepstrip | 8 ++++---- 1 file 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 -- cgit v1.2.3-1-g7c22