[patch] the patch.. version 1

keepdebug.patch (text/plain), 12.03 KB, created by Olivier Crete (RETIRED) on 2004-03-19 11:45:10 UTC

diff -u bin.orig/dobin bin/dobin
--- bin.orig/dobin	2004-03-19 13:11:35.000000000 +0100
+++ bin/dobin	2004-03-19 13:57:37.701226488 +0100
@@ -10,22 +10,40 @@
 
 if [ ! -z "${CBUILD}" ] && [ "${CBUILD}" != "${CHOST}" ]; then
 	STRIP=${CHOST}-strip
+	OBJCOPY=${CHOST}-objcopy
 else
 	STRIP=strip
+	OBJCOPY=objcopy
 fi
 
 if [ ! -d "${D}${DESTTREE}/bin" ] ; then
 	install -d "${D}${DESTTREE}/bin"
 fi
 
+if ( [ "${FEATURES//*keepdebug*/true}" == "true" ] || [ "${RESTRICT//*keepdebug*/true}" == "true" ] ) && [ ! -d "${D}${DESTTREE}/bin/.debug" ] ; then
+	install -d "${D}${DESTTREE}/bin/.debug"
+fi
+
+
 for x in "$@" ; do
 	if [ -x "${x}" ] ; then
+		if [ "${FEATURES//*keepdebug*/true}" == "true" ] || [ "${RESTRICT//*keepdebug*/true}" == "true" ] ; then
+			${OBJCOPY} --only-keep-debug ${x} ${x}.dbg	
+		fi
 		if [ "${FEATURES//*nostrip*/true}" != "true" ] && [ "${RESTRICT//*nostrip*/true}" != "true" ] ; then
 			MYVAL=`file "${x}" | grep "ELF"` 
 			if [ -n "$MYVAL" ] ; then
-				${STRIP} "${x}"
+				if [ "${FEATURES//*keepdebug*/true}" == "true" ] || [ "${RESTRICT//*keepdebug*/true}" == "true" ] ; then
+					${STRIP} --strip-debug "${x}"
+				else
+					${STRIP} "${x}"
+				fi
 			fi
 		fi
+		if [ "${FEATURES//*keepdebug*/true}" == "true" ] || [ "${RESTRICT//*keepdebug*/true}" == "true" ] ; then
+			${OBJCOPY} --add-gnu-debuglink=${x}.dbg ${x}
+			install ${x}.dbg "${S}${DESTREE}/bin/.debug"
+		fi 
 		#if executable, use existing perms
 		install "${x}" "${D}${DESTTREE}/bin"
 	else
diff -u bin.orig/doexe bin/doexe
--- bin.orig/doexe	2004-03-19 13:11:35.000000000 +0100
+++ bin/doexe	2004-03-19 13:59:36.472170560 +0100
@@ -12,17 +12,31 @@
 	install -d "${D}${EXEDESTTREE}"
 fi
 
+if ( [ "${FEATURES//*keepdebug*/true}" == "true" ] || [ "${RESTRICT//*keepdebug*/true}" == "true" ] ) && [ ! -d "${D}${DESTTREE}/bin/.debug" ] ; then
+	install -d "${D}${DESTTREE}${EXEDESTTREE}/.debug"
+fi
+
 if [ ! -z "${CBUILD}" ] && [ "${CBUILD}" != "${CHOST}" ]; then
 	STRIP=${CHOST}-strip
+	OBJCOPY=${CHOST}-objcopy
 else
 	STRIP=strip
+	OBJCOPY=objcopy
 fi
 
 for x in "$@" ; do
+	if [ "${FEATURES//*keepdebug*/true}" == "true" ] || [ "${RESTRICT//*keepdebug*/true}" == "true" ] ; then
+		${OBJCOPY} --only-keep-debug ${x} ${x}.dbg
+	fi
+
 	if [ "${FEATURES//*nostrip*/true}" != "true" ] && [ "${RESTRICT//*nostrip*/true}" != "true" ] ; then
 		MYVAL=`file "${x}" | grep "ELF"` 
 		if [ -n "$MYVAL" ] ; then
-			${STRIP} "${x}"
+			if [ "${FEATURES//*keepdebug*/true}" == "true" ] || [ "${RESTRICT//*keepdebug*/true}" == "true" ] ; then
+				${STRIP} --strip-debug "${x}"
+			else
+				${STRIP} "${x}"
+			fi
 		fi
 	fi
 	if [ -L "${x}" ] ; then
@@ -34,5 +48,9 @@
 	else
 		mysrc="${x}"
 	fi
+	if [ "${FEATURES//*keepdebug*/true}" == "true" ] || [ "${RESTRICT//*keepdebug*/true}" == "true" ] ; then
+		${OBJCOPY} --add-gnu-debuglink=${x}.dbg ${x}
+		install ${x}.dbg "${S}${EXEDESTREE}/.debug"
+	fi
 	install ${EXEOPTIONS} "${mysrc}" "${D}${EXEDESTTREE}"
 done
diff -u bin.orig/dolib.so bin/dolib.so
--- bin.orig/dolib.so	2004-03-19 13:11:35.000000000 +0100
+++ bin/dolib.so	2004-03-19 13:59:07.357596648 +0100
@@ -10,19 +10,32 @@
 
 if [ ! -z "${CBUILD}" ] && [ "${CBUILD}" != "${CHOST}" ]; then
 	STRIP=${CHOST}-strip
+	OBJCOPY=${CHOST}-objcopy
 else
 	STRIP=strip
+	OBJCOPY=objcopy
 fi
 
 if [ ! -d "${D}${DESTTREE}/lib" ] ; then
 	install -d "${D}${DESTTREE}/lib"
 fi
 
+if ( [ "${FEATURES//*keepdebug*/true}" == "true" ] || [ "${RESTRICT//*keepdebug*/true}" == "true" ] ) && [ ! -d "${D}${DESTTREE}/lib/.debug" ] ; then
+	install -d "${D}${DESTTREE}/lib/.debug"
+fi
+
+
 for x in "$@" ; do
 	if [ -e "${x}" ] ; then
+		if [ "${FEATURES//*keepdebug*/true}" == "true" ] || [ "${RESTRICT//*keepdebug*/true}" == "true" ] ; then
+		 	${OBJCOPY} --only-keep-debug ${x} ${x}.dbg
+		fi
 		if [ "${FEATURES//*nostrip*/true}" != "true" ] && [ "${RESTRICT//*nostrip*/true}" != "true" ] ; then
 			${STRIP} --strip-debug "${x}"
 		fi
+		if [ "${FEATURES//*keepdebug*/true}" == "true" ] || [ "${RESTRICT//*keepdebug*/true}" == "true" ] ; then
+			${OBJCOPY} --add-gnu-debuglink=${x}.dbg ${x}
+			install -m0644 ${x}.dbg "${S}${DESTREE}/lib/.debug"
 		install -m0755 "${x}" "${D}${DESTTREE}/lib"
 	else
 		echo "${0}: ${x} does not exist"
diff -u bin.orig/dosbin bin/dosbin
--- bin.orig/dosbin	2004-03-19 13:11:35.000000000 +0100
+++ bin/dosbin	2004-03-19 13:58:20.410733656 +0100
@@ -11,20 +11,36 @@
 	install -d "${D}${DESTTREE}/sbin"
 fi
 
+if ( [ "${FEATURES//*keepdebug*/true}" == "true" ] || [ "${RESTRICT//*keepdebug*/true}" == "true" ] ) && [ ! -d "${D}${DESTTREE}/sbin/.debug" ] ; then
+        install -d "${D}${DESTTREE}/sbin/.debug"
+fi
+
 if [ ! -z "${CBUILD}" ] && [ "${CBUILD}" != "${CHOST}" ]; then
 	STRIP=${CHOST}-strip
+	OBJCOPY=${CHOST}-objcopy
 else
 	STRIP=strip
+	OBJCOPY=objcopy
 fi
-
 for x in "$@" ; do
 	if [ -x "${x}" ] ; then
+		if [ "${FEATURES//*keepdebug*/true}" == "true" ] || [ "${RESTRICT//*keepdebug*/true}" == "true" ] ; then
+			${OBJCOPY} --only-keep-debug ${x} ${x}.dbg
+		fi
 		if [ "${FEATURES//*nostrip*/true}" != "true" ] && [ "${RESTRICT//*nostrip*/true}" != "true" ] ; then
 			MYVAL=`file "${x}" | grep "ELF"`
 			if [ "$MYVAL" ] ; then
-				${STRIP} "${x}"
+				if [ "${FEATURES//*keepdebug*/true}" == "true" ] || [ "${RESTRICT//*keepdebug*/true}" == "true" ] ; then
+					${STRIP} --strip-debug "${x}"
+				else
+					${STRIP} "${x}"
+				fi
 			fi
 		fi
+		if [ "${FEATURES//*keepdebug*/true}" == "true" ] || [ "${RESTRICT//*keepdebug*/true}" == "true" ] ; then
+			 ${OBJCOPY} --add-gnu-debuglink=${x}.dbg ${x}
+		         install -m644 ${x}.dbg "${S}${DESTREE}/sbin/.debug"
+		fi
 		#if executable, use existing perms
 		install -m0755 "${x}" "${D}${DESTTREE}/sbin"
 	else
diff -u bin.orig/ebuild.sh bin/ebuild.sh
--- bin.orig/ebuild.sh	2004-03-19 13:11:35.000000000 +0100
+++ bin/ebuild.sh	2004-03-19 13:22:39.386218856 +0100
@@ -591,7 +591,9 @@
 	INSOPTIONS=""
 	for x in $*; do
 		#if we have a debug build, let's not strip anything
-		if has nostrip $FEATURES $RESTRICT && [ "$x" == "-s" ]; then
+		#if we use separate debug, we have to strip by hand
+		if ( has nostrip $FEATURES $RESTRICT || 
+		has keepdebug $FEATURES $RESTRICT ) && [ "$x" == "-s" ]; then
 			continue
  		else
 			INSOPTIONS="$INSOPTIONS $x"
@@ -612,7 +614,8 @@
 	EXEOPTIONS=""
 	for x in $*; do
 		#if we have a debug build, let's not strip anything
-		if has nostrip $FEATURES $RESTRICT && [ "$x" == "-s" ]; then
+		if ( has nostrip $FEATURES $RESTRICT  ||
+		has keepdebug $FEATURES $RESTRICT ) && [ "$x" == "-s" ]; then
 			continue
 		else
 			EXEOPTIONS="$EXEOPTIONS $x"
@@ -625,7 +628,8 @@
 	LIBOPTIONS=""
 	for x in $*; do
 		#if we have a debug build, let's not strip anything
-		if has nostrip $FEATURES $RESTRICT && [ "$x" == "-s" ]; then
+		if ( has nostrip $FEATURES $RESTRICT ||
+		has keepdebug $FEATURES $RESTRICT ) && [ "$x" == "-s" ]; then
 			continue
 		else
 			LIBOPTIONS="$LIBOPTIONS $x"
@@ -990,6 +994,8 @@
 	echo -n "  build mode  : "
 	if has nostrip $FEATURES $RESTRICT;	then
 		echo "debug (large)"
+	elif has keepdebug $FEATURES $RESTRICT;	then
+		echo "development (separate debug information)"
 	else
 		echo "production (stripped)"
 	fi
diff -u bin.orig/prepallstrip bin/prepallstrip
--- bin.orig/prepallstrip	2004-03-19 13:11:35.000000000 +0100
+++ bin/prepallstrip	2004-03-19 14:00:36.709013168 +0100
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /home/cvsroot/gentoo-src/portage/bin/prepallstrip,v 1.11 2003/04/09 14:36:59 carpaski Exp $
 
-if [ "${FEATURES//*nostrip*/true}" == "true" ] || [ "${RESTRICT//*nostrip*/true}" == "true" ] ; then
+if ( [ "${FEATURES//*nostrip*/true}" == "true" ] || [ "${RESTRICT//*nostrip*/true}" == "true" ] ) && ( [ "${FEATURES//*keepdebug*/true}" != "true" ] && [ "${RESTRICT//*keepdebug*/true}" != "true" ] ) ; then
 	exit 0
 fi
 
diff -u bin.orig/preplib.so bin/preplib.so
--- bin.orig/preplib.so	2004-03-19 13:11:35.000000000 +0100
+++ bin/preplib.so	2004-03-19 14:34:33.126430664 +0100
@@ -3,14 +3,16 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /home/cvsroot/gentoo-src/portage/bin/preplib.so,v 1.9 2003/04/09 14:36:59 carpaski Exp $
 
-if [ "${FEATURES//*nostrip*/true}" == "true" ] || [ "${RESTRICT//*nostrip*/true}" == "true" ] ; then
+if ( [ "${FEATURES//*nostrip*/true}" == "true" ] || [ "${RESTRICT//*nostrip*/true}" == "true" ] ) && ( [ "${FEATURES//*keepdebug*/true}" != "true" ] && [ "${RESTRICT//*keepdebug*/true}" != "true" ] ); then
 	exit 0
 fi
 
 if [ ! -z "${CBUILD}" ] && [ "${CBUILD}" != "${CHOST}" ]; then
 	STRIP=${CHOST}-strip
+	OBJCOPY=${CHOST}-objcopy
 else
 	STRIP=strip
+	OBJCOPY=objcopy
 fi
 
 for x in "$@" ; do
@@ -19,7 +21,20 @@
 			f="`file "${y}"`"
 			if [ "${f/*SB shared object*/1}" == "1" ] ; then
 				echo "${y}"
-				${STRIP} --strip-debug "${y}"
+				if [ "${FEATURES//*keepdebug*/true}" == "true" ] || [ "${RESTRICT//*keepdebug*/true}" == "true" ]; then
+					if [ ! -d "$(dirname "${x}")/.debug" ] ; then
+						install -d "$(dirname "${x}")/.debug"
+					fi
+					${OBJCOPY} --only-keep-debug ${x} $(dirname "${x}")/.debug/$(basename "${x}").dbg
+					if [ "${FEATURES//*nostrip*/true}" != "true" ] && [ "${RESTRICT//*nostrip*/true}" != "true" ] ; then
+						${STRIP} --strip-debug "${x}"
+					else
+						${STRIP} "${x}"
+					fi
+					${OBJCOPY} --add-gnu-debuglink=$(dirname "${x}")/.debug/$(basename "${x}").dbg ${x}
+				else
+					${STRIP} --strip-debug "${y}"
+				fi
 			fi
 		done
 		ldconfig -n -N "${D}${x}"
diff -u bin.orig/prepstrip bin/prepstrip
--- bin.orig/prepstrip	2004-03-19 13:11:35.000000000 +0100
+++ bin/prepstrip	2004-03-19 14:33:47.837315656 +0100
@@ -3,15 +3,18 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /home/cvsroot/gentoo-src/portage/bin/prepstrip,v 1.17 2004/02/04 22:40:21 carpaski Exp $
 
-if [ "${FEATURES//*nostrip*/true}" == "true" ] || [ "${RESTRICT//*nostrip*/true}" == "true" ] ; then
+if ( [ "${FEATURES//*nostrip*/true}" == "true" ] || [ "${RESTRICT//*nostrip*/true}" == "true" ] ) && ( [ "${FEATURES//*keepdebug*/true}" != "true" ] && [ "${RESTRICT//*keepdebug*/true}" != "true" ] ) ; then
 	echo "nostrip"
 	exit 0
 fi
 
+
 if [ ! -z "${CBUILD}" ] && [ "${CBUILD}" != "${CHOST}" ]; then
 	STRIP=${CHOST}-strip
+	OBJCOPY=${CHOST}-objcopy
 else
 	STRIP=strip
+	OBJCOPY=objcopy
 fi
 
 echo "strip: "
@@ -24,19 +27,43 @@
 		f=$(file "${x}")
 		if [ -z "${f/*SB executable*/}" ]; then
 			echo "   ${x:${#D}:${#x}}"
-			${STRIP} "${x}"
+			if [ "${FEATURES//*keepdebug*/true}" == "true" ] || [ "${RESTRICT//*keepdebug*/true}" == "true" ]; then
+				if [ ! -d "$(dirname "${x}")/.debug" ] ; then
+					install -d "$(dirname "${x}")/.debug"
+				fi
+				${OBJCOPY} --only-keep-debug ${x} $(dirname "${x}")/.debug/$(basename "${x}").dbg
+				if [ "${FEATURES//*nostrip*/true}" != "true" ] && [ "${RESTRICT//*nostrip*/true}" != "true" ] ; then
+					${STRIP} --strip-debug "${x}"
+				else
+					 ${STRIP} "${x}"
+				fi
+				${OBJCOPY} --add-gnu-debuglink=$(dirname "${x}")/.debug/$(basename "${x}").dbg ${x}
+			else
+				${STRIP} "${x}"
+			fi
 		fi
 		if [ -z "${f/*SB shared object*/}" ]; then
 			echo "   ${x:${#D}:${#x}}"
-			${STRIP} --strip-unneeded "${x}"
-
-			# etdyn binaries are shared objects, but not really. Non-relocatable.
-			if [ -x /usr/bin/isetdyn ]; then
-				if /usr/bin/isetdyn "${x}" >/dev/null; then
-					${STRIP} "${x}"
+			if [ "${FEATURES//*keepdebug*/true}" == "true" ] || [ "${RESTRICT//*keepdebug*/true}" == "true" ]; then
+				if [ ! -d "$(dirname "${x}")/.debug" ] ; then
+					install -d "$(dirname "${x}")/.debug"
+				fi
+				${OBJCOPY} --only-keep-debug ${x} $(dirname "${x}")/.debug/$(basename "${x}").dbg
+				if [ "${FEATURES//*nostrip*/true}" != "true" ] && [ "${RESTRICT//*nostrip*/true}" != "true" ] ; then
+					${STRIP} --strip-debug "${x}"
+				else
+					${STRIP} --strip-unneeded "${x}"
+				fi
+				${OBJCOPY} --add-gnu-debuglink=$(dirname "${x}")/.debug/$(basename "${x}").dbg ${x}
+			else
+				${STRIP} --strip-unneeded "${x}"
+				# etdyn binaries are shared objects, but not really. Non-relocatable.
+				if [ -x /usr/bin/isetdyn ]; then
+					if /usr/bin/isetdyn "${x}" >/dev/null; then
+						${STRIP} "${x}"
+					fi
 				fi
 			fi
-
 		fi
 	fi
 done