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 2159 by niro, Wed Aug 14 07:55:29 2013 UTC revision 2362 by niro, Mon Jan 6 12:47:23 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 609  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 623  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 638  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 677  setup_ccache_environment() Line 688  setup_ccache_environment()
    688  {  {
    689   if [ -x /usr/bin/ccache ]   if [ -x /usr/bin/ccache ]
    690   then   then
    691   mqueryfeature "icecream" && export CCACHE_PREFIX=icecc   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"
    # Line 1045  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_VARS="${SAVED_SPECIAL_FUNCTIONS}"   export SPECIAL_FUNCTIONS="${SAVED_SPECIAL_FUNCTIONS}"
    1060   export STATE="${SAVED_STATE}"   export STATE="${SAVED_STATE}"
    1061   export INHERITS="${SAVED_INHERITS}"   export INHERITS="${SAVED_INHERITS}"
    1062   export DEPEND="${SAVED_DEPEND}"   export DEPEND="${SAVED_DEPEND}"
    Legend:
    Removed from v.2159  
    changed lines
      Added in v.2362