Magellan Linux

  • Back to homepage
    • /[magellan-source]/branches/mage-next/src/smage2.in

    Diff of /branches/mage-next/src/smage2.in

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 1594 by niro, Thu Dec 29 15:21:25 2011 UTC revision 1616 by niro, Mon Jan 9 20:11:08 2012 UTC
    # Line 177  download_sources() Line 177  download_sources()
    177   fi   fi
    178    
    179   echo -e "${COLBLUE}==>${COLGREEN} fetching ${uri}${COLDEFAULT}"   echo -e "${COLBLUE}==>${COLGREEN} fetching ${uri}${COLDEFAULT}"
    180   mdownload --uri "${uri}" --dir "${outputdir}" || die "Could not download '${uri}'"   # do not die here, mchecksum catches download errors
    181     mdownload --uri "${uri}" --dir "${outputdir}"
    182    
    183   # unset them to be sure   # unset them to be sure
    184   unset uri   unset uri
    # Line 236  mlibdir() Line 237  mlibdir()
    237    
    238  mconfigure()  mconfigure()
    239  {  {
    240     local myopts
    241     if [[ ! -z ${CTARGET} ]]
    242     then
    243     myopts="--target=${CTARGET}"
    244     fi
    245    
    246   if [ -x ./configure ]   if [ -x ./configure ]
    247   then   then
    248   ./configure \   ./configure \
    # Line 248  mconfigure() Line 255  mconfigure()
    255   --sysconfdir=/etc \   --sysconfdir=/etc \
    256   --localstatedir=/var/lib \   --localstatedir=/var/lib \
    257   --libdir=/usr/$(mlibdir) \   --libdir=/usr/$(mlibdir) \
    258     ${myopts} \
    259   "$@" || die "mconfigure failed"   "$@" || die "mconfigure failed"
    260   else   else
    261   echo "configure is not an executable ..."   echo "configure is not an executable ..."
    # Line 343  munpack() Line 351  munpack()
    351   rar)   rar)
    352   unrar x ${SOURCEDIR}/${PNAME}/${SRCFILE} ${DEST}  || die ".rar unpack failed."   unrar x ${SOURCEDIR}/${PNAME}/${SRCFILE} ${DEST}  || die ".rar unpack failed."
    353   ;;   ;;
    354   zip|xpi)   zip|xpi|jar)
    355   unzip ${SOURCEDIR}/${PNAME}/${SRCFILE} -d ${DEST} || die ".zip unpack failed."   unzip ${SOURCEDIR}/${PNAME}/${SRCFILE} -d ${DEST} || die ".zip unpack failed."
    356   ;;   ;;
    357   rpm)   rpm)
    # Line 423  minstalldocs() Line 431  minstalldocs()
    431   then   then
    432   if mqueryfeature "compressdoc"   if mqueryfeature "compressdoc"
    433   then   then
    434   cat ${doc} | gzip -9c > ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/${doc}.gz || die "gzipping +installing ${doc}."   cat ${doc} | gzip -9c > ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/$(basename ${doc}).gz || die "gzipping +installing ${doc}."
    435   chmod 0644 ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/${doc}.gz || die "fixing permissions of ${doc}."   chmod 0644 ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/$(basename ${doc}).gz || die "fixing permissions of ${doc}."
    436   else   else
    437   install -m 0644 ${SRCDIR}/${i} ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "installing ${doc}."   install -m 0644 ${SRCDIR}/${i} ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "installing ${doc}."
    438   fi   fi
    # Line 464  mstriplibtoolarchive() Line 472  mstriplibtoolarchive()
    472   local stripdir="$@"   local stripdir="$@"
    473    
    474   [[ -z ${stripdir} ]] && stripdir="${BINDIR}"   [[ -z ${stripdir} ]] && stripdir="${BINDIR}"
    475   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
    476  }  }
    477    
    478  mpurgetargets()  mpurgetargets()
    # Line 898  split_restore_variables() Line 906  split_restore_variables()
    906    
    907   # special handling needed for mage features   # special handling needed for mage features
    908   # pkgbuild   # pkgbuild
    909   msetfeature "${SAVED_FEATURE_PKGBUILD}"   FVERBOSE=off msetfeature "${SAVED_FEATURE_PKGBUILD}"
    910   # strip   # strip
    911   msetfeature "${SAVED_FEATURE_STRIP}"   FVERBOSE=off msetfeature "${SAVED_FEATURE_STRIP}"
    912   # libtool   # libtool
    913   msetfeature "${SAVED_FEATURE_LIBTOOL}"   FVERBOSE=off msetfeature "${SAVED_FEATURE_LIBTOOL}"
    914   # compressdoc   # compressdoc
    915   msetfeature "${SAVED_FEATURE_COMPRESSDOC}"   FVERBOSE=off msetfeature "${SAVED_FEATURE_COMPRESSDOC}"
    916    
    917   # bindir too   # bindir too
    918   export BINDIR="${SAVED_BINDIR}"   export BINDIR="${SAVED_BINDIR}"
    # Line 1399  export -f src_install || die "src_instal Line 1407  export -f src_install || die "src_instal
    1407  # fixes some compile issues  # fixes some compile issues
    1408  export CHOST="${CHOST}" || die "CHOST export failed"  export CHOST="${CHOST}" || die "CHOST export failed"
    1409  export CFLAGS="${CFLAGS}" || die "CFLAGS export failed"  export CFLAGS="${CFLAGS}" || die "CFLAGS export failed"
    1410  export CXXFLAGS="${CFLAGS}" || die "CXXFLAGS export failed"  if [[ -z ${CXXFLAGS} ]]
    1411    then
    1412     export CXXFLAGS="${CFLAGS}" || die "CXXFLAGS export failed"
    1413    else
    1414     export CXXFLAGS="${CXXFLAGS}" || die "CXXFLAGS export failed"
    1415    fi
    1416    export LDFLAGS="${LDFLAGS}" || die "LDFLAGS export failed"
    1417  export BINDIR="${BINDIR}" || die "BINDIR export failed"  export BINDIR="${BINDIR}" || die "BINDIR export failed"
    1418  export MAKEOPTS="${MAKEOPTS}" || die "MAKEOPTS export failed"  export MAKEOPTS="${MAKEOPTS}" || die "MAKEOPTS export failed"
    1419    
    # Line 1509  echo Line 1523  echo
    1523  if mqueryfeature "!compressdoc"  if mqueryfeature "!compressdoc"
    1524  then  then
    1525   echo -e "!compressdoc detected; documentation will not be compressed ..."   echo -e "!compressdoc detected; documentation will not be compressed ..."
    1526    elif mqueryfeature "!pkgbuild"
    1527    then
    1528     echo "!pkgbuild detected; skipping documentation compression..."
    1529  else  else
    1530   # compressing doc, info & man files   # compressing doc, info & man files
    1531   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
    # Line 1524  fi Line 1541  fi
    1541    
    1542  if mqueryfeature "!libtool"  if mqueryfeature "!libtool"
    1543  then  then
    1544     if mqueryfeature "!pkgbuild"
    1545     then
    1546     echo "!pkgbuild detected; skipping libtool archive stripping ..."
    1547     else
    1548   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
    1549   then   then
    1550   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
    # Line 1535  then Line 1556  then
    1556   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives ...${COLDEFAULT}"
    1557   mstriplibtoolarchive ${BINDIR}   mstriplibtoolarchive ${BINDIR}
    1558   fi   fi
    1559     fi
    1560  fi  fi
    1561    
    1562  if mqueryfeature "purge"  if mqueryfeature "purge"
    1563  then  then
    1564     if mqueryfeature "!pkgbuild"
    1565     then
    1566     echo "!pkgbuild detected; skipping file purgation..."
    1567     else
    1568   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
    1569   then   then
    1570   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
    # Line 1550  then Line 1576  then
    1576   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets ...${COLDEFAULT}"
    1577   mpurgetargets ${BINDIR}   mpurgetargets ${BINDIR}
    1578   fi   fi
    1579     fi
    1580  fi  fi
    1581    
    1582  # stripping all bins and libs  # stripping all bins and libs
    1583  if mqueryfeature "!strip"  if mqueryfeature "!strip"
    1584  then  then
    1585   echo -e "!strip detected; Package will not be stripped ..."   echo -e "!strip detected; Package will not be stripped ..."
    1586    elif mqueryfeature "!pkgbuild"
    1587    then
    1588     echo "!pkgbuild detected; skipping stripping of the package ..."
    1589  else  else
    1590   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
    1591   then   then
    1592   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
    1593   do   do
    1594   echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"
    1595   mstripbins ${BINDIR}_${subpackage}   mstripbins ${BINDIR}_${subpackage}
    1596   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}"
    1597   mstriplibs ${BINDIR}_${subpackage}   mstriplibs ${BINDIR}_${subpackage}
    1598   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}"
    1599   mstripstatic ${BINDIR}_${subpackage}   mstripstatic ${BINDIR}_${subpackage}
    1600   done   done
    1601   else   else
    1602   echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"
    1603   mstripbins ${BINDIR}   mstripbins ${BINDIR}
    1604   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries ...${COLDEFAULT}"
    1605   mstriplibs ${BINDIR}   mstriplibs ${BINDIR}
    1606   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries ...${COLDEFAULT}"
    1607   mstripstatic ${BINDIR}   mstripstatic ${BINDIR}
    1608   fi   fi
    1609  fi  fi
    1610    
    1611  if mqueryfeature "!buildpkg"  if mqueryfeature "!pkgbuild"
    1612  then  then
    1613   echo -e "!buildpkg detected; Package will not be build ..."   echo -e "!pkgbuild detected; Package will not be build ..."
    1614  else  else
    1615   # build several targets   # build several targets
    1616   if [[ -n ${MAGE_TARGETS} ]]   if [[ -n ${MAGE_TARGETS} ]]
    # Line 1620  else Line 1650  else
    1650   export PNAME="${subpackage}"   export PNAME="${subpackage}"
    1651   split_info_${PNAME}   split_info_${PNAME}
    1652    
    1653   # jump to next one if !buildpkg is set in split_info   # jump to next one if !pkgbuild is set in split_info
    1654   mqueryfeature "!buildpkg" && continue   mqueryfeature "!pkgbuild" && continue
    1655    
    1656   # check if an special subpackage_pkgbuild exists   # check if an special subpackage_pkgbuild exists
    1657   if typeset -f ${PNAME}_pkgbuild > /dev/null   if typeset -f ${PNAME}_pkgbuild > /dev/null
    Legend:
    Removed from v.1594  
    changed lines
      Added in v.1616