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 1651 by niro, Fri Jan 13 22:26:20 2012 UTC revision 2362 by niro, Mon Jan 6 12:47:23 2014 UTC
    # Line 7  Line 7 
    7  smagesource()  smagesource()
    8  {  {
    9   local file="$1"   local file="$1"
    10   local mystate   local localstate
    11     local distfilestate
    12   local mytag   local mytag
    13    
    14   source ${file}   source ${file}
    # Line 29  smagesource() Line 30  smagesource()
    30   fi   fi
    31   fi   fi
    32    
    33   [[ -n ${STATE} ]] && mystate="${STATE}"   [[ -n ${STATE} ]] && localstate="${STATE}"
    34   [[ -n ${DISTROTAG} ]] && mytag="${DISTROTAG}"   [[ -n ${DISTROTAG} ]] && mytag="${DISTROTAG}"
    35    
      # do not overide if local state was broken or disabled!  
      case ${STATE} in  
      broken) return ;;  
      disabled) return ;;  
      esac  
       
    36   if [ -f ${SMAGESCRIPTSDIR}/distribution ]   if [ -f ${SMAGESCRIPTSDIR}/distribution ]
    37   then   then
    38   source ${SMAGESCRIPTSDIR}/distribution   source ${SMAGESCRIPTSDIR}/distribution
    39   [[ -n ${STATE} ]] && mystate="${STATE}"   [[ -n ${STATE} ]] && distfilestate="${STATE}"
    40   [[ -n ${DISTROTAG} ]] && mytag="${DISTROTAG}"   [[ -n ${DISTROTAG} ]] && mytag="${DISTROTAG}"
    41   fi   fi
    42   # now switch state and export it   # now switch state and export it but do not overide any local states
    43   STATE="${mystate}"   if [[ ! -z ${localstate} ]]
    44     then
    45     STATE="${localstate}"
    46     else
    47     STATE="${distfilestate}"
    48     fi
    49    
    50   if mqueryfeature "pkgdistrotag"   if mqueryfeature "pkgdistrotag"
    51   then   then
    # Line 59  smagesource() Line 59  smagesource()
    59   echo -e "${COLRED}Requested 'pkgdistrotag' but no \$DISTROTAG found!${COLDEFAULT}"   echo -e "${COLRED}Requested 'pkgdistrotag' but no \$DISTROTAG found!${COLDEFAULT}"
    60   echo -e "${COLRED}Disabled the feature for pkgbuild sanity!${COLDEFAULT}"   echo -e "${COLRED}Disabled the feature for pkgbuild sanity!${COLDEFAULT}"
    61   else   else
    62   # now switch state and export it   # now switch state and export it but do not overide any local states
    63   export DISTROTAG="${mytag}"   export DISTROTAG="${mytag}"
    64   fi   fi
    65   else   else
    # Line 281  mconfigure() Line 281  mconfigure()
    281   fi   fi
    282   fi   fi
    283    
    284   # always enable shared by default   # always enable shared by default but not for waf configure
    285   if [[ ! -z $(./configure --help | grep -- '--.*able-shared') ]]   if [[ ! -z $(./configure --help | grep -- '--.*able-shared') ]] &&
    286     [[ -z $(./configure --version | grep waf) ]]
    287   then   then
    288   myopts+=" --enable-shared"   myopts+=" --enable-shared"
    289   fi   fi
    # Line 317  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 342  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 391  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 570  sminclude() Line 573  sminclude()
    573   fi   fi
    574  }  }
    575    
    576    march()
    577    {
    578     local retval
    579    
    580     if [[ ! -z ${ARCH} ]]
    581     then
    582     echo "${ARCH}"
    583     retval=0
    584     else
    585     retval=1
    586     fi
    587    
    588     return "${retval}"
    589    }
    590    
    591    marchsrcfile()
    592    {
    593     local retval
    594     local var="$1"
    595    
    596     [[ -z ${var} ]] && var="SRCFILE"
    597    
    598     if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
    599     then
    600     eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
    601     retval=0
    602     else
    603     retval=1
    604     fi
    605    
    606     return "${retval}"
    607    }
    608    
    609    marchsrcdir()
    610    {
    611     local retval
    612     local var="$1"
    613    
    614     [[ -z ${var} ]] && var="SRCDIR"
    615    
    616     if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
    617     then
    618     eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
    619     retval=0
    620     else
    621     retval=1
    622     fi
    623    
    624     return "${retval}"
    625    }
    626    
    627    marchdepend()
    628    {
    629     local retval
    630     local var="$1"
    631    
    632     [[ -z ${var} ]] && var="DEPEND"
    633    
    634     if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
    635     then
    636     echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"
    637     retval=0
    638     else
    639     retval=1
    640     fi
    641    
    642     return "${retval}"
    643    }
    644    
    645    marchsdepend()
    646    {
    647     local retval
    648     local var="$1"
    649    
    650     [[ -z ${var} ]] && var="SDEPEND"
    651    
    652     if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
    653     then
    654     echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"
    655     retval=0
    656     else
    657     retval=1
    658     fi
    659    
    660     return "${retval}"
    661    }
    662    
    663  setup_distcc_environment()  setup_distcc_environment()
    664  {  {
    665   if [ -x /usr/bin/distcc ]   if [ -x /usr/bin/distcc ]
    # Line 585  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 603  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 874  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 949  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 1018  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 1183  source_pkg_build() Line 1291  source_pkg_build()
    1291   [[ ! -d ${SRCPKGDIR} ]] && install -d ${SRCPKGDIR}   [[ ! -d ${SRCPKGDIR} ]] && install -d ${SRCPKGDIR}
    1292   mv ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${SRCPKGDIR}/${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX}   mv ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${SRCPKGDIR}/${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX}
    1293    
    1294   echo -e "${COLGREEN}Source package ${COLBLUE}${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX} ${COLGREEN}successfully builded.${COLDEFAULT}"   echo -e "${COLGREEN}Source package ${COLBLUE}${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX} ${COLGREEN}successfully builded.${COLDEFAULT}\n"
    1295  }  }
    1296    
    1297  step_by_step()  step_by_step()
    # Line 1215  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.1651  
    changed lines
      Added in v.2362