Magellan Linux

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

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

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

    revision 1617 by niro, Mon Jan 9 20:13:34 2012 UTC revision 1631 by niro, Fri Jan 13 13:20:22 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     # always use verbose mode for source downloads
    181     FVERBOSE=off msetfeature "verbose"
    182   # do not die here, mchecksum catches download errors   # do not die here, mchecksum catches download errors
    183   mdownload --uri "${uri}" --dir "${outputdir}"   mdownload --uri "${uri}" --dir "${outputdir}"
    184    
    # Line 240  mconfigure() Line 242  mconfigure()
    242   local myopts   local myopts
    243   if [[ ! -z ${CTARGET} ]]   if [[ ! -z ${CTARGET} ]]
    244   then   then
    245   myopts="--target=${CTARGET}"   myopts+=" --target=${CTARGET}"
    246   fi   fi
    247     # if requested disable-static
    248     if [[ ! -z $(./configure --help | grep -- '--.*able-static') ]]
    249     then
    250     if mqueryfeature '!static'
    251     then
    252     myopts+=" --disable-static"
    253     else
    254     myopts+=" --enable-static"
    255     fi
    256     fi
    257    
    258     # always enable shared by default
    259     if [[ ! -z $(./configure --help | grep -- '--.*able-shared') ]]
    260     then
    261     myopts+=" --enable-shared"
    262     fi
    263    
    264   if [ -x ./configure ]   if [ -x ./configure ]
    265   then   then
    # Line 1146  step_by_step() Line 1164  step_by_step()
    1164  resume_stamp()  resume_stamp()
    1165  {  {
    1166   local step="$1"   local step="$1"
    1167   touch ${BUILDDIR}/.smage-${PKGNAME}-${step}   [[ ! -d ${BUILDDIR}/.stamps ]] && install -d ${BUILDDIR}/.stamps
    1168     touch ${BUILDDIR}/.stamps/smage-${PKGNAME}-${step}
    1169  }  }
    1170    
    1171  run_resume()  run_resume()
    1172  {  {
    1173   local step="$1"   local step="$1"
    1174    
    1175   if mqueryfeature "resume" && [[ -f ${BUILDDIR}/.smage-${PKGNAME}-${step} ]]   if mqueryfeature "resume" && [[ -f ${BUILDDIR}/.stamps/smage-${PKGNAME}-${step} ]]
    1176   then   then
    1177   echo -e "${COLMAGENTA}${step} already processed; doing nothing${COLDEFAULT}"   echo -e "${COLMAGENTA}${step} already processed; doing nothing${COLDEFAULT}"
    1178   return 0   return 0
    # Line 1486  else Line 1505  else
    1505   rm -rf ${BUILDDIR}/${PKGNAME}   rm -rf ${BUILDDIR}/${PKGNAME}
    1506   fi   fi
    1507    
    1508     # clean up stamps dir
    1509     if [ -d ${BUILDDIR}/.stamps ]
    1510     then
    1511     rm -rf ${BUILDDIR}/.stamps
    1512     fi
    1513    
    1514   # setup build logging   # setup build logging
    1515   [[ ! -d /var/log/smage ]] && install -d /var/log/smage   [[ ! -d /var/log/smage ]] && install -d /var/log/smage
    1516   echo -e "### Build started on $(date) ###\n" > /var/log/smage/${PKGNAME}.log   echo -e "### Build started on $(date) ###\n" > /var/log/smage/${PKGNAME}.log
    # Line 1758  else Line 1783  else
    1783   # build src-pkg-tarball if requested   # build src-pkg-tarball if requested
    1784   if mqueryfeature "srcpkg"   if mqueryfeature "srcpkg"
    1785   then   then
    1786   resume_stamp srcpkgbuild || source_pkg_build ${SMAGENAME}   run_resume srcpkgbuild || source_pkg_build ${SMAGENAME}
    1787   resume_stamp srcpkgbuild   resume_stamp srcpkgbuild
    1788   fi   fi
    1789  fi  fi
    Legend:
    Removed from v.1617  
    changed lines
      Added in v.1631