--- trunk/mage/usr/lib/mage/smage2.sh 2005/02/16 17:50:54 66 +++ trunk/mage/usr/lib/mage/smage2.sh 2005/07/23 16:34:29 156 @@ -4,14 +4,14 @@ # needs pkgbuild_dir (mage) # SMAGE2 -# version: 0.3.6-r15 +# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.14 2005-07-23 16:34:29 niro Exp $ #01.10.2004 # added ccache support # added distcc support ## setup ## -SMAGEVERSION=0.3.6-r15 +SMAGEVERSION=0.3.6-r18 PKGSUFFIX="mpk" SMAGENAME="$1" SMAGESUFFIX="smage2" @@ -179,12 +179,13 @@ --progress bar \ --directory-prefix="${my_SOURCEDIR}" \ "${my_SRC_URI}" - if [ "$?" == "0" ] - then - break - else - continue - fi +# only needed to run through a list of mirrors +# if [ "$?" == "0" ] +# then +# break +# else +# continue +# fi fi fi @@ -339,6 +340,20 @@ done } +mstriplibs() { + local stripdir="$@" + + [ -z "${stripdir}" ] && stripdir=${BINDIR} + find ${stripdir} | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +} + +mstripbins() { + local stripdir="$@" + + [ -z "${stripdir}" ] && stripdir=${BINDIR} + find ${stripdir} | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +} + setup_distcc_environment(){ if [ -x /usr/bin/distcc ] then @@ -637,6 +652,19 @@ ${MLIBDIR}/compressdoc -g -9 ${BUILDDIR}/builded/usr/share/info fi +# stripping all bins and libs +case ${NOSTRIP} in + true|TRUE|yes|y) + echo -e "NOSTRIP=true detected; Package will not be stripped ..." + ;; + *) + echo -e "Stripping binaries ..." + mstripbins ${BINDIR} + echo -e "Stripping libraries ..." + mstriplibs ${BINDIR} + ;; +esac + #the new buildpkg command case ${NOPKGBUILD} in true|TRUE|yes|y) @@ -650,6 +678,7 @@ #for sure unset NOPKGBUILD +unset NOSTRIP xtitleclean #echo -e "\nPackage ${PKGNAME} successfully builded.\n"