Attachment #35701 for bug #45150





if [ ! -z "${CBUILD}" ] && [ "${CBUILD}" != "${CHOST}" ]; then
	STRIP=${CHOST}-strip
else
	STRIP=strip
fi

for x in "$@" ; do
	if [ "${FEATURES//*nostrip*/true}" != "true" ] && [ "${RESTRICT//*nostrip*/true}" != "true" ] ; then
		MYVAL=`file "${x}" | grep "ELF"` 
		if [ -n "$MYVAL" ] ; then
			${STRIP} "${x}"
		fi
	fi
	if [ -L "${x}" ] ; then

Lines 10-17 Link Here

(-)bin/dolib.so (-9 lines)
10		10
11	if [ ! -z "${CBUILD}" ] && [ "${CBUILD}" != "${CHOST}" ]; then
12	STRIP=${CHOST}-strip
13	else
14	STRIP=strip
15	fi
16
17	if [ ! -d "${D}${DESTTREE}/lib" ] ; then	11	if [ ! -d "${D}${DESTTREE}/lib" ] ; then
Lines 22-26 Link Here
22	if [ -e "${x}" ] ; then	16	if [ -e "${x}" ] ; then
23	if [ "${FEATURES//nostrip/true}" != "true" ] && [ "${RESTRICT//nostrip/true}" != "true" ] ; then
24	${STRIP} --strip-debug "${x}"
25	fi
26	install -m0755 "${x}" "${D}${DESTTREE}/lib"	17	install -m0755 "${x}" "${D}${DESTTREE}/lib"

Lines 691-694 Link Here

(-)bin/ebuild.sh (-6 / +31 lines)
691	for x in $*; do	691	for x in $*; do
692	#if we have a debug build, let's not strip anything	692	# lets not strip anything here.. we will do that in prepstrip
693	if hasq nostrip $FEATURES $RESTRICT && [ "$x" == "-s" ]; then	693	+ if [ "$x" == "-s" ]; then
694	continue	694	continue
Lines 712-715 Link Here
712	for x in $*; do	712	for x in $*; do
713	#if we have a debug build, let's not strip anything	713	# lets not strip anything here.. we will do that in prepstrip
714	if hasq nostrip $FEATURES $RESTRICT && [ "$x" == "-s" ]; then	714	if [ "$x" == "-s" ]; then
715	continue	715	continue
Lines 725-728 Link Here
725	for x in $*; do	725	for x in $*; do
726	#if we have a debug build, let's not strip anything	726	# lets not strip anything here.. we will do that in prepstrip
727	if hasq nostrip $FEATURES $RESTRICT && [ "$x" == "-s" ]; then	727	if [ "$x" == "-s" ]; then
728	continue	728	continue
Lines 1447-1448 Link Here
1447		1447
		1448	if has keepdebug ${FEATURES} ${RESTRICT} &>/dev/null \|\|
		1449	has keepdebugbin ${FEATURES} ${RESTRICT} &>/dev/null; then
		1450	if ! which eu-strip &>/dev/null; then
		1451	# if we dont have eu-strip, lets remove those now
		1452	FEATURES_TEMP=${FEATURES/keepdebugbin/}
		1453	FEATURES=${FEATURES_TEMP/keepdebug/}
		1454	RESTRICT_TEMP=${RESTRICT/keepdebugbin/}
		1455	RESTRICT=${RESTRICT_TEMP/keepdebug/}
		1456	fi
		1457	fi
		1458
		1459	# Remove keepsources if we strip or if we dont have debugedit
		1460	if has keepsources ${FEATURES} ${RESTRICT} &>/dev/null; then
		1461	if has nostrip ${FEATURES} ${RESTRICT} &>/dev/null \|\|
		1462	has keepdebug ${FEATURES} &>/dev/null \|\|
		1463	has keepdebugbin ${FEATURES} &>/dev/null; then
		1464	if ! which debugedit &>/dev/null \|\|
		1465	! which cpio &>/dev/null ; then
		1466	FEATURES=${FEATURES/keepsources/}
		1467	RESTRICT=${RESTRICT/keepsources/}
		1468	fi
		1469	fi
		1470	fi
		1471
		1472
1448	# XXX: Load up the helper functions.	1473	# XXX: Load up the helper functions.

Lines 5-7 Link Here

(-)bin/prepallstrip (-1 / +1 lines)
5		5
6	if [ "${FEATURES//nostrip/true}" == "true" ] \|\| [ "${RESTRICT//nostrip/true}" == "true" ] ; then	6	if ( [ "${FEATURES//nostrip/true}" == "true" ] \|\| [ "${RESTRICT//nostrip/true}" == "true" ] ) && ( [ "${FEATURES//keepdebug/true}" != "true" ] && [ "${RESTRICT//keepdebug/true}" != "true" ] ) ; then
7	exit 0	7	exit 0





if ( [ "${FEATURES//*nostrip*/true}" == "true" ] || [ "${RESTRICT//*nostrip*/true}" == "true" ] ) && ( [ "${FEATURES//*keepdebug*/true}" != "true" ] && [ "${RESTRICT//*keepdebug*/true}" != "true" ] ) ; then
	echo "nostrip"
	exit 0

	STRIP=${CHOST}-strip
	EUSTRIP=${CHOST}-eu-strip
else
	STRIP=strip
	EUSTRIP=eu-strip
fi

echo "strip: "
for x in "$@"; do # "$@" quotes each element... Plays nice with spaces.

			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}}"
 			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} --strip-unneeded "${x}"
  				fi


Return to bug 45150

Lines 14-28 Link Here

(-)bin/doexe (-12 lines)
14		14
15	if [ ! -z "${CBUILD}" ] && [ "${CBUILD}" != "${CHOST}" ]; then
16	STRIP=${CHOST}-strip
17	else
18	STRIP=strip
19	fi
20
21	for x in "$@" ; do	15	for x in "$@" ; do
22	if [ "${FEATURES//nostrip/true}" != "true" ] && [ "${RESTRICT//nostrip/true}" != "true" ] ; then
23	MYVAL=`file "${x}" \| grep "ELF"`
24	if [ -n "$MYVAL" ] ; then
25	${STRIP} "${x}"
26	fi
27	fi
28	if [ -L "${x}" ] ; then	16	if [ -L "${x}" ] ; then

Lines 5-8 Link Here

(-)bin/prepstrip (-3 / +40 lines)
5		5
6	if [ "${FEATURES//nostrip/true}" == "true" ] \|\| [ "${RESTRICT//nostrip/true}" == "true" ] ; then	6	if ( [ "${FEATURES//nostrip/true}" == "true" ] \|\| [ "${RESTRICT//nostrip/true}" == "true" ] ) && ( [ "${FEATURES//keepdebug/true}" != "true" ] && [ "${RESTRICT//keepdebug/true}" != "true" ] ) ; then
7	echo "nostrip"
8	exit 0	7	exit 0
Lines 12-18 Link Here
12	STRIP=${CHOST}-strip	11	STRIP=${CHOST}-strip
		12	EUSTRIP=${CHOST}-eu-strip
13	else	13	else
14	STRIP=strip	14	STRIP=strip
		15	EUSTRIP=eu-strip
15	fi	16	fi
16		17
17	echo "strip: "
18	for x in "$@"; do # "$@" quotes each element... Plays nice with spaces.	18	for x in "$@"; do # "$@" quotes each element... Plays nice with spaces.
Lines 26-32 Link Here
26	echo " ${x:${#D}:${#x}}"	26	echo " ${x:${#D}:${#x}}"
		27
		28	if ( [ "${FEATURES//nostrip/true}" == "true" ] \|\| [ "${RESTRICT//nostrip/true}" == "true" ] \|\|
		29	[ "${FEATURES//keepdebugbin/true}" == "true" ] \|\| [ "${RESTRICT//keepdebugbin/true}" == "true" ] ) &&
		30	[ "${FEATURES//keepsources/true}" == "true" ] \|\| [ "${RESTRICT//keepsources/true}" == "true" ]; then
		31	debugedit -b ${WORKDIR} -d /usr/src/debug/${P} -l ${T}/debug.sources "$x"
		32	if [ -s ${T}/debug.sources ]; then
		33	[ -d ${D}/usr/src/debug/${P} ] \|\| mkdir -p ${D}/usr/src/debug/${P}
		34	cat ${T}/debug.sources \| (cd ${WORKDIR}; LANG=C sort -z -u \| xargs -0 -- cp --parents -p --target-directory="${D}usr/src/debug/${P}" )
		35	fi
		36	fi
		37	if [ "${FEATURES//nostrip/true}" != "true" ] && [ "${RESTRICT//nostrip/true}" != "true" ]; then
		38	if [ ! -e "$(dirname ${x})/.debug/$(basename ${x}).dbg" ] && [ "${FEATURES//keepdebugbin/true}" == "true" ] \|\| [ "${RESTRICT//keepdebugbin/true}" == "true" ]; then
		39	if [ ! -d "$(dirname "${x}")/.debug" ] ; then
		40	install -d "$(dirname "${x}")/.debug"
		41	fi
		42	${EUSTRIP} -f "$(dirname ${x})/.debug/$(basename ${x}).dbg" "${x}"
		43	else
27	${STRIP} "${x}"	44	${STRIP} "${x}"
28	fi	45	fi
		46	fi
		47
		48	fi
29	if [ -z "${f/SB shared object/}" ]; then	49	if [ -z "${f/SB shared object/}" ]; then
30	echo " ${x:${#D}:${#x}}"	50	echo " ${x:${#D}:${#x}}"
		51	if ( [ "${FEATURES//nostrip/true}" == "true" ] \|\| [ "${RESTRICT//nostrip/true}" == "true" ] \|\|
		52	[ "${FEATURES//keepdebug/true}" == "true" ] \|\| [ "${RESTRICT//keepdebug/true}" == "true" ] ) &&
		53	[ "${FEATURES//keepsources/true}" == "true" ] \|\| [ "${RESTRICT//keepsources/true}" == "true" ]; then
		54	debugedit -b ${WORKDIR} -d /usr/src/debug/${P} -l ${T}/debug.sources "$x"
		55	if [ -s ${T}/debug.sources ]; then
		56	[ -d ${D}/usr/src/debug/${P} ] \|\| mkdir -p ${D}/usr/src/debug/${P}
		57	cat ${T}/debug.sources \| (cd ${WORKDIR}; LANG=C sort -z -u \| xargs -0 -- cp --parents -p --target-directory=${D}/usr/src/debug/${P} )
		58	fi
		59	fi
		60	if [ "${FEATURES//nostrip/true}" != "true" ] && [ "${RESTRICT//nostrip/true}" != "true" ]; then
		61	if [ ! -e "$(dirname ${x})/.debug/$(basename ${x}).dbg" ] && [ "${FEATURES//keepdebug/true}" == "true" ] \|\| [ "${RESTRICT//keepdebug/true}" == "true" ]; then
		62	if [ ! -d "$(dirname "${x}")/.debug" ] ; then
		63	install -d "$(dirname "${x}")/.debug"
		64	fi
		65	${EUSTRIP} -f "$(dirname ${x})/.debug/$(basename ${x}).dbg" "${x}"
		66	else
31	${STRIP} --strip-unneeded "${x}"	67	${STRIP} --strip-unneeded "${x}"
		68	fi
32		69