Magellan Linux

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

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

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

    revision 1689 by niro, Thu Feb 16 11:58:12 2012 UTC revision 2361 by niro, Mon Jan 6 12:40:29 2014 UTC
    # Line 318  minstall() Line 318  minstall()
    318   sysconfdir=${BINDIR}/etc \   sysconfdir=${BINDIR}/etc \
    319   libdir=${BINDIR}/usr/$(mlibdir) \   libdir=${BINDIR}/usr/$(mlibdir) \
    320   "$@" install || die "minstall failed"   "$@" install || die "minstall failed"
    321          else   else
    322                  die "no Makefile found"   die "no Makefile found"
    323          fi   fi
    324  }  }
    325    
    326  mmake()  mmake()
    # Line 343  munpack() Line 343  munpack()
    343   DEST=$2   DEST=$2
    344   fi   fi
    345    
    346     echo -e "${COLBLUE}>>>${COLGREEN} Unpacking ${SOURCEDIR}/${PNAME}/${SRCFILE}${COLDEFAULT}"
    347    
    348   [[ ! -d ${DEST} ]] && install -d ${DEST}   [[ ! -d ${DEST} ]] && install -d ${DEST}
    349    
    350   case "${SRCFILE##*.}" in   case "${SRCFILE##*.}" in
    # Line 392  munpack() Line 394  munpack()
    394   tar --no-same-owner -xvJf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".txz unpack failed."   tar --no-same-owner -xvJf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".txz unpack failed."
    395   ;;   ;;
    396   rar)   rar)
    397   unrar x ${SOURCEDIR}/${PNAME}/${SRCFILE} ${DEST}  || die ".rar unpack failed."   unrar x ${SOURCEDIR}/${PNAME}/${SRCFILE} ${DEST} || die ".rar unpack failed."
    398   ;;   ;;
    399   zip|xpi|jar)   zip|xpi|jar)
    400   unzip ${SOURCEDIR}/${PNAME}/${SRCFILE} -d ${DEST} || die ".zip unpack failed."   unzip ${SOURCEDIR}/${PNAME}/${SRCFILE} -d ${DEST} || die ".zip unpack failed."
    # Line 589  march() Line 591  march()
    591  marchsrcfile()  marchsrcfile()
    592  {  {
    593   local retval   local retval
    594   if [[ ! -z $(eval echo \$SRCFILE_${ARCH/i*86/x86}) ]]   local var="$1"
    595    
    596     [[ -z ${var} ]] && var="SRCFILE"
    597    
    598     if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
    599   then   then
    600   eval echo \$SRCFILE_${ARCH/i*86/x86} | tr ';' '\n'   eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
    601   retval=0   retval=0
    602   else   else
    603   retval=1   retval=1
    # Line 658  setup_distcc_environment() Line 664  setup_distcc_environment()
    664   fi   fi
    665  }  }
    666    
    667    setup_icecc_environment()
    668    {
    669     if [ -x /usr/bin/icecc ]
    670     then
    671     echo -e "${COLBLUE}---${COLGREEN} Using IceCC for compilation ...${COLDEFAULT}"
    672     export PATH=/usr/$(mlibdir)/icecc/bin:${PATH} || die "icecc: could not export new $PATH"
    673     fi
    674    }
    675    
    676  setup_ccache_environment()  setup_ccache_environment()
    677  {  {
    678   if [ -x /usr/bin/ccache ]   if [ -x /usr/bin/ccache ]
    679   then   then
    680     mqueryfeature "icecc" && export CCACHE_PREFIX=icecc
    681    
    682   echo -e "${COLBLUE}---${COLGREEN} Using CCache for compilation ...${COLDEFAULT}"   echo -e "${COLBLUE}---${COLGREEN} Using CCache for compilation ...${COLDEFAULT}"
    683   export PATH=/usr/$(mlibdir)/ccache/bin:${PATH} || die "ccache: could not export new $PATH"   export PATH=/usr/$(mlibdir)/ccache/bin:${PATH} || die "ccache: could not export new $PATH"
    684   fi   fi
    # Line 676  fix_mage_deps() Line 693  fix_mage_deps()
    693   local NDEPEND   local NDEPEND
    694   local sym dep cat pver pname   local sym dep cat pver pname
    695    
    696     # first of all remove all tabs and duplicate lines
    697     if [ -n "${depend}" ]
    698     then
    699     depend=$(echo "${depend}" | sed 's:\t::g' | sort -u)
    700     fi
    701    
    702   # deps and provides are special   # deps and provides are special
    703   # they must be fixed to match the target   # they must be fixed to match the target
    704    
    # Line 947  split_save_variables() Line 970  split_save_variables()
    970   export SAVED_DESCRIPTION="${DESCRIPTION}"   export SAVED_DESCRIPTION="${DESCRIPTION}"
    971   export SAVED_HOMEPAGE="${HOMEPAGE}"   export SAVED_HOMEPAGE="${HOMEPAGE}"
    972   export SAVED_SPECIAL_VARS="${SPECIAL_VARS}"   export SAVED_SPECIAL_VARS="${SPECIAL_VARS}"
    973     export SAVED_SPECIAL_FUNCTIONS="${SPECIAL_FUNCTIONS}"
    974   export SAVED_STATE="${STATE}"   export SAVED_STATE="${STATE}"
      export SAVED_PKGTYPE="${PKGTYPE}"  
    975   export SAVED_INHERITS="${INHERITS}"   export SAVED_INHERITS="${INHERITS}"
    976   export SAVED_DEPEND="${DEPEND}"   export SAVED_DEPEND="${DEPEND}"
    977   export SAVED_SDEPEND="${SDEPEND}"   export SAVED_SDEPEND="${SDEPEND}"
    # Line 1022  split_restore_variables() Line 1045  split_restore_variables()
    1045   export DESCRIPTION="${SAVED_DESCRIPTION}"   export DESCRIPTION="${SAVED_DESCRIPTION}"
    1046   export HOMEPAGE="${SAVED_HOMEPAGE}"   export HOMEPAGE="${SAVED_HOMEPAGE}"
    1047   export SPECIAL_VARS="${SAVED_SPECIAL_VARS}"   export SPECIAL_VARS="${SAVED_SPECIAL_VARS}"
    1048     export SPECIAL_FUNCTIONS="${SAVED_SPECIAL_FUNCTIONS}"
    1049   export STATE="${SAVED_STATE}"   export STATE="${SAVED_STATE}"
      export PKGTYPE="${SAVED_PKGTYPE}"  
    1050   export INHERITS="${SAVED_INHERITS}"   export INHERITS="${SAVED_INHERITS}"
    1051   export DEPEND="${SAVED_DEPEND}"   export DEPEND="${SAVED_DEPEND}"
    1052   export SDEPEND="${SAVED_SDEPEND}"   export SDEPEND="${SAVED_SDEPEND}"
    # Line 1091  split_unset_variables() Line 1114  split_unset_variables()
    1114   unset SAVED_DESCRIPTION   unset SAVED_DESCRIPTION
    1115   unset SAVED_HOMEPAGE   unset SAVED_HOMEPAGE
    1116   unset SAVED_SPECIAL_VARS   unset SAVED_SPECIAL_VARS
    1117     unset SAVED_SPECIAL_FUNCTIONS
    1118   unset SAVED_STATE   unset SAVED_STATE
    1119   unset SAVED_PKGTYPE   unset SAVED_PKGTYPE
    1120   unset SAVED_INHERITS   unset SAVED_INHERITS
    # Line 1288  run_resume() Line 1312  run_resume()
    1312   return 1   return 1
    1313   fi   fi
    1314  }  }
    1315    
    1316    mqalint()
    1317    {
    1318     return 0
    1319    }
    Legend:
    Removed from v.1689  
    changed lines
      Added in v.2361