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 2363 by niro, Mon Jan 6 12:49:32 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 564  sminclude() Line 566  sminclude()
    566   then   then
    567   for i in $@   for i in $@
    568   do   do
    569   echo "--- Including ${SMAGESCRIPTSDIR}/include/${i}.sminc"   [[ ${SILENT} = 1 ]] || echo "--- Including ${SMAGESCRIPTSDIR}/include/${i}.sminc"
    570   source ${SMAGESCRIPTSDIR}/include/${i}.sminc   source ${SMAGESCRIPTSDIR}/include/${i}.sminc
    571   done   done
    572   echo   [[ ${SILENT} = 1 ]] || echo
    573   fi   fi
    574  }  }
    575    
    # 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 603  marchsrcfile() Line 609  marchsrcfile()
    609  marchsrcdir()  marchsrcdir()
    610  {  {
    611   local retval   local retval
    612   if [[ ! -z $(eval echo \$SRCDIR_${ARCH/i*86/x86}) ]]   local var="$1"
    613    
    614     [[ -z ${var} ]] && var="SRCDIR"
    615    
    616     if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
    617   then   then
    618   eval echo \$SRCDIR_${ARCH/i*86/x86} | tr ';' '\n'   eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
    619   retval=0   retval=0
    620   else   else
    621   retval=1   retval=1
    # Line 617  marchsrcdir() Line 627  marchsrcdir()
    627  marchdepend()  marchdepend()
    628  {  {
    629   local retval   local retval
    630     local var="$1"
    631    
    632     [[ -z ${var} ]] && var="DEPEND"
    633    
    634   if [[ ! -z $(eval echo \$DEPEND_${ARCH/i*86/x86}) ]]   if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
    635   then   then
    636   echo "\$(eval echo \\\$DEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"   echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"
    637   retval=0   retval=0
    638   else   else
    639   retval=1   retval=1
    # Line 632  marchdepend() Line 645  marchdepend()
    645  marchsdepend()  marchsdepend()
    646  {  {
    647   local retval   local retval
    648   if [[ ! -z $(eval echo \$SDEPEND_${ARCH/i*86/x86}) ]]   local var="$1"
    649    
    650     [[ -z ${var} ]] && var="SDEPEND"
    651    
    652     if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
    653   then   then
    654   echo "\$(eval echo \\\$SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"   echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"
    655   retval=0   retval=0
    656   else   else
    657   retval=1   retval=1
    # Line 658  setup_distcc_environment() Line 675  setup_distcc_environment()
    675   fi   fi
    676  }  }
    677    
    678    setup_icecc_environment()
    679    {
    680     if [ -x /usr/bin/icecc ]
    681     then
    682     echo -e "${COLBLUE}---${COLGREEN} Using IceCC for compilation ...${COLDEFAULT}"
    683     export PATH=/usr/$(mlibdir)/icecc/bin:${PATH} || die "icecc: could not export new $PATH"
    684     fi
    685    }
    686    
    687  setup_ccache_environment()  setup_ccache_environment()
    688  {  {
    689   if [ -x /usr/bin/ccache ]   if [ -x /usr/bin/ccache ]
    690   then   then
    691     mqueryfeature "icecc" && export CCACHE_PREFIX=icecc
    692    
    693   echo -e "${COLBLUE}---${COLGREEN} Using CCache for compilation ...${COLDEFAULT}"   echo -e "${COLBLUE}---${COLGREEN} Using CCache for compilation ...${COLDEFAULT}"
    694   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"
    695   fi   fi
    # Line 676  fix_mage_deps() Line 704  fix_mage_deps()
    704   local NDEPEND   local NDEPEND
    705   local sym dep cat pver pname   local sym dep cat pver pname
    706    
    707     # first of all remove all tabs and duplicate lines
    708     if [ -n "${depend}" ]
    709     then
    710     depend=$(echo "${depend}" | sed 's:\t::g' | sort -u)
    711     fi
    712    
    713   # deps and provides are special   # deps and provides are special
    714   # they must be fixed to match the target   # they must be fixed to match the target
    715    
    # Line 947  split_save_variables() Line 981  split_save_variables()
    981   export SAVED_DESCRIPTION="${DESCRIPTION}"   export SAVED_DESCRIPTION="${DESCRIPTION}"
    982   export SAVED_HOMEPAGE="${HOMEPAGE}"   export SAVED_HOMEPAGE="${HOMEPAGE}"
    983   export SAVED_SPECIAL_VARS="${SPECIAL_VARS}"   export SAVED_SPECIAL_VARS="${SPECIAL_VARS}"
    984     export SAVED_SPECIAL_FUNCTIONS="${SPECIAL_FUNCTIONS}"
    985   export SAVED_STATE="${STATE}"   export SAVED_STATE="${STATE}"
      export SAVED_PKGTYPE="${PKGTYPE}"  
    986   export SAVED_INHERITS="${INHERITS}"   export SAVED_INHERITS="${INHERITS}"
    987   export SAVED_DEPEND="${DEPEND}"   export SAVED_DEPEND="${DEPEND}"
    988   export SAVED_SDEPEND="${SDEPEND}"   export SAVED_SDEPEND="${SDEPEND}"
    # Line 1022  split_restore_variables() Line 1056  split_restore_variables()
    1056   export DESCRIPTION="${SAVED_DESCRIPTION}"   export DESCRIPTION="${SAVED_DESCRIPTION}"
    1057   export HOMEPAGE="${SAVED_HOMEPAGE}"   export HOMEPAGE="${SAVED_HOMEPAGE}"
    1058   export SPECIAL_VARS="${SAVED_SPECIAL_VARS}"   export SPECIAL_VARS="${SAVED_SPECIAL_VARS}"
    1059     export SPECIAL_FUNCTIONS="${SAVED_SPECIAL_FUNCTIONS}"
    1060   export STATE="${SAVED_STATE}"   export STATE="${SAVED_STATE}"
      export PKGTYPE="${SAVED_PKGTYPE}"  
    1061   export INHERITS="${SAVED_INHERITS}"   export INHERITS="${SAVED_INHERITS}"
    1062   export DEPEND="${SAVED_DEPEND}"   export DEPEND="${SAVED_DEPEND}"
    1063   export SDEPEND="${SAVED_SDEPEND}"   export SDEPEND="${SAVED_SDEPEND}"
    # Line 1091  split_unset_variables() Line 1125  split_unset_variables()
    1125   unset SAVED_DESCRIPTION   unset SAVED_DESCRIPTION
    1126   unset SAVED_HOMEPAGE   unset SAVED_HOMEPAGE
    1127   unset SAVED_SPECIAL_VARS   unset SAVED_SPECIAL_VARS
    1128     unset SAVED_SPECIAL_FUNCTIONS
    1129   unset SAVED_STATE   unset SAVED_STATE
    1130   unset SAVED_PKGTYPE   unset SAVED_PKGTYPE
    1131   unset SAVED_INHERITS   unset SAVED_INHERITS
    # Line 1288  run_resume() Line 1323  run_resume()
    1323   return 1   return 1
    1324   fi   fi
    1325  }  }
    1326    
    1327    mqalint()
    1328    {
    1329     return 0
    1330    }
    Legend:
    Removed from v.1689  
    changed lines
      Added in v.2363