[patch] Updated patch

keepdebug5-cvs3.patch (text/plain), 6.60 KB, created by Richard Lärkäng on 2005-03-12 06:15:18 UTC

Index: bin/ebuild.sh
===================================================================
RCS file: /var/cvsroot/gentoo-src/portage/bin/ebuild.sh,v
retrieving revision 1.175
diff -b -u -1 -r1.175 ebuild.sh
--- bin/ebuild.sh	10 Jul 2004 04:32:32 -0000	1.175
+++ bin/ebuild.sh	18 Jul 2004 16:17:13 -0000
@@ -766,8 +766,8 @@
 insopts() {
 	INSOPTIONS=""
 	for x in $*; do
-		#if we have a debug build, let's not strip anything
-		if hasq nostrip $FEATURES $RESTRICT && [ "$x" == "-s" ]; then
+		# lets not strip anything here.. we will do that in prepstrip
+ 		if [ "$x" == "-s" ]; then
 			continue
 		else
 			INSOPTIONS="$INSOPTIONS $x"
@@ -787,8 +787,8 @@
 exeopts() {
 	EXEOPTIONS=""
 	for x in $*; do
-		#if we have a debug build, let's not strip anything
-		if hasq nostrip $FEATURES $RESTRICT && [ "$x" == "-s" ]; then
+		# lets not strip anything here.. we will do that in prepstrip
+ 		if [ "$x" == "-s" ]; then
 			continue
 		else
 			EXEOPTIONS="$EXEOPTIONS $x"
@@ -800,8 +800,8 @@
 libopts() {
 	LIBOPTIONS=""
 	for x in $*; do
-		#if we have a debug build, let's not strip anything
-		if hasq nostrip $FEATURES $RESTRICT && [ "$x" == "-s" ]; then
+		# lets not strip anything here.. we will do that in prepstrip
+ 		if [ "$x" == "-s" ]; then
 			continue
 		else
 			LIBOPTIONS="$LIBOPTIONS $x"
@@ -1634,6 +1634,31 @@
 		ccache -M ${CCACHE_SIZE} &> /dev/null
 	fi
 
+	if has keepdebug ${FEATURES} ${RESTRICT} &>/dev/null || 
+		has keepdebugbin ${FEATURES} ${RESTRICT} &>/dev/null; then
+		if ! which eu-strip &>/dev/null; then
+			# if we dont have eu-strip, lets remove those now
+			FEATURES_TEMP=${FEATURES/keepdebugbin/}
+			FEATURES=${FEATURES_TEMP/keepdebug/}
+			RESTRICT_TEMP=${RESTRICT/keepdebugbin/}
+			RESTRICT=${RESTRICT_TEMP/keepdebug/}
+		fi
+	fi
+
+	# Remove keepsources if we strip or if we dont have debugedit
+	if has keepsources ${FEATURES} ${RESTRICT} &>/dev/null; then
+		if has nostrip ${FEATURES} ${RESTRICT} &>/dev/null ||
+			has keepdebug ${FEATURES} &>/dev/null || 
+			has keepdebugbin ${FEATURES} &>/dev/null; then
+			if ! which debugedit &>/dev/null || 
+				! which cpio &>/dev/null ; then
+				FEATURES=${FEATURES/keepsources/}
+				RESTRICT=${RESTRICT/keepsources/}
+			fi
+		fi
+	fi
+	
+
 	# XXX: Load up the helper functions.
 #	for X in /usr/lib/portage/bin/functions/*.sh; do
 #		source ${X} || die "Failed to source ${X}"
Index: bin/prepallstrip
===================================================================
RCS file: /var/cvsroot/gentoo-src/portage/bin/prepallstrip,v
retrieving revision 1.11
diff -b -u -1 -r1.11 prepallstrip
--- bin/prepallstrip	9 Apr 2003 14:36:59 -0000	1.11
+++ bin/prepallstrip	18 Jul 2004 16:17:13 -0000
@@ -5,3 +5,3 @@
 
-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
Index: bin/prepstrip
===================================================================
RCS file: /var/cvsroot/gentoo-src/portage/bin/prepstrip,v
retrieving revision 1.20
diff -b -u -1 -r1.20 prepstrip
--- bin/prepstrip	10 Jul 2004 04:32:32 -0000	1.20
+++ bin/prepstrip	18 Jul 2004 16:17:13 -0000
@@ -3,12 +3,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-src/portage/bin/prepstrip,v 1.23.2.1 2004/12/06 03:01:43 carpaski Exp $
 
-if [ "${FEATURES//*nostrip*/true}" == "true" ] || [ "${RESTRICT//*nostrip*/true}" == "true" ] ; then
-	echo "nostrip"
+if ( [ "${FEATURES//*nostrip*/true}" == "true" ] || [ "${RESTRICT//*nostrip*/true}" == "true" ] ) && ( [ "${FEATURES//*keepdebug*/true}" != "true" ] && [ "${RESTRICT//*keepdebug*/true}" != "true" ] ) ; then
 	STRIP="/bin/false"
 else
 	STRIP="${STRIP:-${CHOST}-strip}"
 	type -p ${STRIP} > /dev/null || STRIP=strip
+	EUSTRIP=eu-strip
 fi
 
 PORTAGE_STRIP_FLAGS="${PORTAGE_STRIP_FLAGS:---strip-unneeded}"
@@ -29,11 +30,49 @@
 		fi
 		if [ -z "${f/*SB executable*/}" ]; then
 			echo "   ${x:${#D}:${#x}}"
+			
+			if ( [ "${FEATURES//*nostrip*/true}" == "true" ] || [ "${RESTRICT//*nostrip*/true}" == "true" ] ||
+ 					[ "${FEATURES//*keepdebugbin*/true}" == "true" ] || [ "${RESTRICT//*keepdebugbin*/true}" == "true" ] ) && 
+ 				[ "${FEATURES//*keepsources*/true}" == "true" ] || [ "${RESTRICT//*keepsources*/true}" == "true" ]; then
+ 				debugedit -b ${WORKDIR} -d /usr/src/debug/${P} -l ${T}/debug.sources "$x"
+ 				if [ -s ${T}/debug.sources ]; then 
+ 					[ -d ${D}/usr/src/debug/${P} ] || mkdir -p ${D}/usr/src/debug/${P}
+ 					cat ${T}/debug.sources | (cd ${WORKDIR}; LANG=C sort -z -u | xargs -0 -- cp --parents -p --target-directory="${D}usr/src/debug/${P}" )
+ 				fi
+ 			fi
+ 			if [ "${FEATURES//*nostrip*/true}" != "true" ] && [ "${RESTRICT//*nostrip*/true}" != "true" ]; then
+ 				if [ ! -e "$(dirname ${x})/.debug/$(basename ${x}).dbg" ] && [ "${FEATURES//*keepdebugbin*/true}" == "true" ] || [ "${RESTRICT//*keepdebugbin*/true}" == "true" ]; then
+ 					if [ ! -d "$(dirname "${x}")/.debug" ] ; then
+ 						install -d "$(dirname "${x}")/.debug"
+ 					fi
+ 					${EUSTRIP} -f "$(dirname ${x})/.debug/$(basename ${x}).dbg" "${x}"
+ 				else
 			${STRIP} "${x}"
 		fi
+ 			fi
+
+		fi
 		if [ -z "${f/*SB shared object*/}" ]; then
 			echo "   ${x:${#D}:${#x}}"
-			${STRIP} ${PORTAGE_STRIP_FLAGS} "${x}"
+ 			if ( [ "${FEATURES//*nostrip*/true}" == "true" ] || [ "${RESTRICT//*nostrip*/true}" == "true" ] ||
+ 					[ "${FEATURES//*keepdebug*/true}" == "true" ] || [ "${RESTRICT//*keepdebug*/true}" == "true" ] ) &&
+ 				[ "${FEATURES//*keepsources*/true}" == "true" ] || [ "${RESTRICT//*keepsources*/true}" == "true" ]; then
+ 				debugedit -b ${WORKDIR} -d /usr/src/debug/${P} -l ${T}/debug.sources "$x"
+ 				if [ -s ${T}/debug.sources ]; then 
+ 					[ -d ${D}/usr/src/debug/${P} ] || mkdir -p ${D}/usr/src/debug/${P}
+ 					cat ${T}/debug.sources | (cd ${WORKDIR}; LANG=C sort -z -u | xargs -0 -- cp --parents -p --target-directory=${D}/usr/src/debug/${P} )
+ 				fi
+ 			fi
+ 			if [ "${FEATURES//*nostrip*/true}" != "true" ] && [ "${RESTRICT//*nostrip*/true}" != "true" ]; then
+ 				if [ ! -e "$(dirname ${x})/.debug/$(basename ${x}).dbg" ] && [ "${FEATURES//*keepdebug*/true}" == "true" ] || [ "${RESTRICT//*keepdebug*/true}" == "true" ]; then
+ 					if [ ! -d "$(dirname "${x}")/.debug" ] ; then
+ 						install -d "$(dirname "${x}")/.debug"
+ 					fi
+ 					${EUSTRIP} -f "$(dirname ${x})/.debug/$(basename ${x}).dbg" "${x}"
+				else
+					${STRIP} ${PORTAGE_STRIP_FLAGS} "${x}"
+  				fi
+			fi
 
 			if [ -x /usr/bin/readelf ] ; then
 				/usr/bin/readelf -d "${x}" | grep TEXTREL > /dev/null