Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/mage/usr/lib/mage/smage2.sh

    Diff of /trunk/mage/usr/lib/mage/smage2.sh

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

    revision 1593 by niro, Thu Dec 29 15:20:20 2011 UTC revision 1614 by niro, Mon Jan 9 20:08:17 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 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 793  regen_mage_tree() Line 801  regen_mage_tree()
    801   unset STATE   unset STATE
    802   unset DESCRIPTION   unset DESCRIPTION
    803   unset HOMEPAGE   unset HOMEPAGE
    804   unset PKGTYPE   # unset PKGTYPE <-- don't do that either; smage needs this var
    805   unset INHERITS   unset INHERITS
    806   unset DEPEND   unset DEPEND
    807   unset SDEPEND   unset SDEPEND
    # 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 1509  echo Line 1517  echo
    1517  if mqueryfeature "!compressdoc"  if mqueryfeature "!compressdoc"
    1518  then  then
    1519   echo -e "!compressdoc detected; documentation will not be compressed ..."   echo -e "!compressdoc detected; documentation will not be compressed ..."
    1520    elif mqueryfeature "!pkgbuild"
    1521    then
    1522     echo "!pkgbuild detected; skipping documentation compression..."
    1523  else  else
    1524   # compressing doc, info & man files   # compressing doc, info & man files
    1525   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
    # Line 1524  fi Line 1535  fi
    1535    
    1536  if mqueryfeature "!libtool"  if mqueryfeature "!libtool"
    1537  then  then
    1538     if mqueryfeature "!pkgbuild"
    1539     then
    1540     echo "!pkgbuild detected; skipping libtool archive stripping ..."
    1541     else
    1542   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
    1543   then   then
    1544   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
    # Line 1535  then Line 1550  then
    1550   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives ...${COLDEFAULT}"
    1551   mstriplibtoolarchive ${BINDIR}   mstriplibtoolarchive ${BINDIR}
    1552   fi   fi
    1553     fi
    1554  fi  fi
    1555    
    1556  if mqueryfeature "purge"  if mqueryfeature "purge"
    1557  then  then
    1558     if mqueryfeature "!pkgbuild"
    1559     then
    1560     echo "!pkgbuild detected; skipping file purgation..."
    1561     else
    1562   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
    1563   then   then
    1564   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
    # Line 1550  then Line 1570  then
    1570   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets ...${COLDEFAULT}"
    1571   mpurgetargets ${BINDIR}   mpurgetargets ${BINDIR}
    1572   fi   fi
    1573     fi
    1574  fi  fi
    1575    
    1576  # stripping all bins and libs  # stripping all bins and libs
    1577  if mqueryfeature "!strip"  if mqueryfeature "!strip"
    1578  then  then
    1579   echo -e "!strip detected; Package will not be stripped ..."   echo -e "!strip detected; Package will not be stripped ..."
    1580    elif mqueryfeature "!pkgbuild"
    1581    then
    1582     echo "!pkgbuild detected; skipping stripping of the package ..."
    1583  else  else
    1584   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
    1585   then   then
    1586   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
    1587   do   do
    1588   echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"
    1589   mstripbins ${BINDIR}_${subpackage}   mstripbins ${BINDIR}_${subpackage}
    1590   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}"
    1591   mstriplibs ${BINDIR}_${subpackage}   mstriplibs ${BINDIR}_${subpackage}
    1592   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}"
    1593   mstripstatic ${BINDIR}_${subpackage}   mstripstatic ${BINDIR}_${subpackage}
    1594   done   done
    1595   else   else
    1596   echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"
    1597   mstripbins ${BINDIR}   mstripbins ${BINDIR}
    1598   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries ...${COLDEFAULT}"
    1599   mstriplibs ${BINDIR}   mstriplibs ${BINDIR}
    1600   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries ...${COLDEFAULT}"
    1601   mstripstatic ${BINDIR}   mstripstatic ${BINDIR}
    1602   fi   fi
    1603  fi  fi
    1604    
    1605  if mqueryfeature "!buildpkg"  if mqueryfeature "!pkgbuild"
    1606  then  then
    1607   echo -e "!buildpkg detected; Package will not be build ..."   echo -e "!pkgbuild detected; Package will not be build ..."
    1608  else  else
    1609   # build several targets   # build several targets
    1610   if [[ -n ${MAGE_TARGETS} ]]   if [[ -n ${MAGE_TARGETS} ]]
    # Line 1620  else Line 1644  else
    1644   export PNAME="${subpackage}"   export PNAME="${subpackage}"
    1645   split_info_${PNAME}   split_info_${PNAME}
    1646    
    1647   # jump to next one if !buildpkg is set in split_info   # jump to next one if !pkgbuild is set in split_info
    1648   mqueryfeature "!buildpkg" && continue   mqueryfeature "!pkgbuild" && continue
    1649    
    1650   # check if an special subpackage_pkgbuild exists   # check if an special subpackage_pkgbuild exists
    1651   if typeset -f ${PNAME}_pkgbuild > /dev/null   if typeset -f ${PNAME}_pkgbuild > /dev/null
    Legend:
    Removed from v.1593  
    changed lines
      Added in v.1614