--- trunk/mage/usr/lib/mage/smage2.sh 2012/01/03 19:11:57 1604 +++ trunk/mage/usr/lib/mage/smage2.sh 2012/01/09 20:11:08 1616 @@ -237,6 +237,12 @@ mconfigure() { + local myopts + if [[ ! -z ${CTARGET} ]] + then + myopts="--target=${CTARGET}" + fi + if [ -x ./configure ] then ./configure \ @@ -249,6 +255,7 @@ --sysconfdir=/etc \ --localstatedir=/var/lib \ --libdir=/usr/$(mlibdir) \ + ${myopts} \ "$@" || die "mconfigure failed" else echo "configure is not an executable ..." @@ -424,8 +431,8 @@ then if mqueryfeature "compressdoc" then - cat ${doc} | gzip -9c > ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/${doc}.gz || die "gzipping +installing ${doc}." - chmod 0644 ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/${doc}.gz || die "fixing permissions of ${doc}." + cat ${doc} | gzip -9c > ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/$(basename ${doc}).gz || die "gzipping +installing ${doc}." + chmod 0644 ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/$(basename ${doc}).gz || die "fixing permissions of ${doc}." else install -m 0644 ${SRCDIR}/${i} ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "installing ${doc}." fi @@ -899,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}" @@ -1400,7 +1407,13 @@ # fixes some compile issues export CHOST="${CHOST}" || die "CHOST export failed" export CFLAGS="${CFLAGS}" || die "CFLAGS export failed" -export CXXFLAGS="${CFLAGS}" || die "CXXFLAGS export failed" +if [[ -z ${CXXFLAGS} ]] +then + export CXXFLAGS="${CFLAGS}" || die "CXXFLAGS export failed" +else + export CXXFLAGS="${CXXFLAGS}" || die "CXXFLAGS export failed" +fi +export LDFLAGS="${LDFLAGS}" || die "LDFLAGS export failed" export BINDIR="${BINDIR}" || die "BINDIR export failed" export MAKEOPTS="${MAKEOPTS}" || die "MAKEOPTS export failed"