Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/mage/usr/lib/mage/smage2.functions.sh

    Diff of /trunk/mage/usr/lib/mage/smage2.functions.sh

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

    revision 1649 by niro, Fri Jan 13 21:04:02 2012 UTC revision 1795 by niro, Wed Apr 11 21:27:09 2012 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 19  smagesource() Line 20  smagesource()
    20   if [[ -n ${PCATEGORIE} ]]   if [[ -n ${PCATEGORIE} ]]
    21   then   then
    22   PCAT="${PCATEGORIE}"   PCAT="${PCATEGORIE}"
    23     unset PCATEGORIE
    24   # print a warning   # print a warning
    25   echo -e "${COLYELLOW}Warning: 'PCATEGORIE' is deprecated and gets removed in the future.${COLDEFAULT}"   echo -e "${COLYELLOW}Warning: 'PCATEGORIE' is deprecated and gets removed in the future.${COLDEFAULT}"
    26   echo -e "${COLYELLOW}         Please modify this smage2 script to use the 'PCAT' variable.${COLDEFAULT}"   echo -e "${COLYELLOW}         Please modify this smage2 script to use the 'PCAT' variable.${COLDEFAULT}"
    # Line 28  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 58  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 280  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 341  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 569  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     if [[ ! -z $(eval echo \$SRCFILE_${ARCH/i*86/x86}) ]]
    595     then
    596     eval echo \$SRCFILE_${ARCH/i*86/x86} | tr ';' '\n'
    597     retval=0
    598     else
    599     retval=1
    600     fi
    601    
    602     return "${retval}"
    603    }
    604    
    605    marchsrcdir()
    606    {
    607     local retval
    608     if [[ ! -z $(eval echo \$SRCDIR_${ARCH/i*86/x86}) ]]
    609     then
    610     eval echo \$SRCDIR_${ARCH/i*86/x86} | tr ';' '\n'
    611     retval=0
    612     else
    613     retval=1
    614     fi
    615    
    616     return "${retval}"
    617    }
    618    
    619    marchdepend()
    620    {
    621     local retval
    622    
    623     if [[ ! -z $(eval echo \$DEPEND_${ARCH/i*86/x86}) ]]
    624     then
    625     echo "\$(eval echo \\\$DEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
    626     retval=0
    627     else
    628     retval=1
    629     fi
    630    
    631     return "${retval}"
    632    }
    633    
    634    marchsdepend()
    635    {
    636     local retval
    637     if [[ ! -z $(eval echo \$SDEPEND_${ARCH/i*86/x86}) ]]
    638     then
    639     echo "\$(eval echo \\\$SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
    640     retval=0
    641     else
    642     retval=1
    643     fi
    644    
    645     return "${retval}"
    646    }
    647    
    648  setup_distcc_environment()  setup_distcc_environment()
    649  {  {
    650   if [ -x /usr/bin/distcc ]   if [ -x /usr/bin/distcc ]
    # Line 812  regen_mage_tree() Line 888  regen_mage_tree()
    888   # get the right variables for the split   # get the right variables for the split
    889   export PNAME="${subpackage}"   export PNAME="${subpackage}"
    890   split_info_${subpackage}   split_info_${subpackage}
    891     # fix PCATEGORIE -> PCAT
    892     if [[ ! -z ${PCATEGORIE} ]]
    893     then
    894     PCAT="${PCATEGORIE}"
    895     unset PCATEGORIE
    896     fi
    897   # get the preinstall etc   # get the preinstall etc
    898   split_export_inherits ${subpackage}   split_export_inherits ${subpackage}
    899   build_mage_script --split-pkg-base "${split_pkg_base}"   build_mage_script --split-pkg-base "${split_pkg_base}"
    # Line 1176  source_pkg_build() Line 1258  source_pkg_build()
    1258   [[ ! -d ${SRCPKGDIR} ]] && install -d ${SRCPKGDIR}   [[ ! -d ${SRCPKGDIR} ]] && install -d ${SRCPKGDIR}
    1259   mv ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${SRCPKGDIR}/${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX}   mv ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${SRCPKGDIR}/${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX}
    1260    
    1261   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"
    1262  }  }
    1263    
    1264  step_by_step()  step_by_step()
    Legend:
    Removed from v.1649  
    changed lines
      Added in v.1795