--- trunk/mage/usr/lib/mage/smage2.sh 2011/12/29 15:23:21 1595 +++ trunk/mage/usr/lib/mage/smage2.sh 2012/01/09 20:08:17 1614 @@ -177,7 +177,8 @@ fi echo -e "${COLBLUE}==>${COLGREEN} fetching ${uri}${COLDEFAULT}" - mdownload --uri "${uri}" --dir "${outputdir}" || die "Could not download '${uri}'" + # do not die here, mchecksum catches download errors + mdownload --uri "${uri}" --dir "${outputdir}" # unset them to be sure unset uri @@ -236,6 +237,12 @@ mconfigure() { + local myopts + if [[ ! -z ${CTARGET} ]] + then + myopts="--target=${CTARGET}" + fi + if [ -x ./configure ] then ./configure \ @@ -248,6 +255,7 @@ --sysconfdir=/etc \ --localstatedir=/var/lib \ --libdir=/usr/$(mlibdir) \ + ${myopts} \ "$@" || die "mconfigure failed" else echo "configure is not an executable ..." @@ -343,7 +351,7 @@ rar) unrar x ${SOURCEDIR}/${PNAME}/${SRCFILE} ${DEST} || die ".rar unpack failed." ;; - zip|xpi) + zip|xpi|jar) unzip ${SOURCEDIR}/${PNAME}/${SRCFILE} -d ${DEST} || die ".zip unpack failed." ;; rpm) @@ -464,7 +472,7 @@ local stripdir="$@" [[ -z ${stripdir} ]] && stripdir="${BINDIR}" - find ${stripdir} ! -type d -name \*.la | xargs file | grep "libtool library" | cut -f 1 -d : | xargs --no-run-if-empty rm -f -- 2> /dev/null + find ${stripdir} ! -type d -name \*.la | xargs | grep "libtool library" | cut -f 1 -d : | xargs --no-run-if-empty rm -f -- 2> /dev/null } mpurgetargets() @@ -898,13 +906,13 @@ # special handling needed for mage features # pkgbuild - msetfeature "${SAVED_FEATURE_PKGBUILD}" + FVERBOSE=off msetfeature "${SAVED_FEATURE_PKGBUILD}" # strip - msetfeature "${SAVED_FEATURE_STRIP}" + FVERBOSE=off msetfeature "${SAVED_FEATURE_STRIP}" # libtool - msetfeature "${SAVED_FEATURE_LIBTOOL}" + FVERBOSE=off msetfeature "${SAVED_FEATURE_LIBTOOL}" # compressdoc - msetfeature "${SAVED_FEATURE_COMPRESSDOC}" + FVERBOSE=off msetfeature "${SAVED_FEATURE_COMPRESSDOC}" # bindir too export BINDIR="${SAVED_BINDIR}"