[patch] Fix location of split-out debug information to comply with FEATURES="multilib-strict"

portage-2.1_preX-splitdebug-multilib-strict.patch (text/plain), 812 bytes, created by Danny van Dyk (RETIRED) on 2005-12-25 05:50:36 UTC

Index: prepstrip
===================================================================
--- prepstrip	(revision 2472)
+++ prepstrip	(working copy)
@@ -12,15 +12,16 @@
 type -p -- ${STRIP} > /dev/null || STRIP=strip
 
 PORTAGE_STRIP_FLAGS=${PORTAGE_STRIP_FLAGS:---strip-unneeded}
+DEBUG_LIBDIR=$(. ${PORTDIR}/eclass/multilib.eclass ; get_libdir)
+[[ ${DEBUG_LIBDIR} == lib* ]] || DEBUG_LIBDIR=lib
 
 banner=1
 
 save_elf_debug() {
+	[ "${FEATURES//*splitdebug*/true}" != "true" ] && return 0
 	local x=$1
-	local y="${D}/usr/lib/debug/${x:${#D}:${#x}}"
-
-	[ "${FEATURES//*splitdebug*/true}" != "true" ] && return 0
-
+	local y="${D}/usr/${DEBUG_LIBDIR}/debug/${x:${#D}:${#x}}"
+	
 	mkdir -p $(dirname ${y})
 	${CHOST}-objcopy --only-keep-debug ${x} ${y}.debug
 	${CHOST}-objcopy --add-gnu-debuglink=${y}.debug ${x}