Magellan Linux

  • Back to homepage
    • /[smage]/branches/R11-unstable/include/multilib.sminc

    Diff of /branches/R11-unstable/include/multilib.sminc

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

    revision 29788 by niro, Thu Oct 12 08:49:24 2017 UTC revision 29792 by niro, Thu Oct 12 11:37:16 2017 UTC
    # Line 7  export MULTILIB_BUILD="true" Line 7  export MULTILIB_BUILD="true"
    7  # be verbose or nor (true|false}  # be verbose or nor (true|false}
    8  : ${MULTILIB_VERBOSE="true"}  : ${MULTILIB_VERBOSE="true"}
    9    
    10    # enter SRCDIR of each abi an abi runs
    11    : ${ABI_DO_NOT_ENTER_SRCDIR="true"}
    12    
    13  # multilib should call all dependant includes, which gets overridden  # multilib should call all dependant includes, which gets overridden
    14  sminclude mtools  sminclude mtools
    15    
    # Line 182  only-m32() Line 185  only-m32()
    185   # export this for mpatch etc (to repect only-${abi})   # export this for mpatch etc (to repect only-${abi})
    186   export MULTILIB_ONLY_ABI=${abi}   export MULTILIB_ONLY_ABI=${abi}
    187    
    188   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${ABI_DO_NOT_ENTER_SRCDIR} != true ]]
    189     then
    190     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    191     fi
    192   abi-${abi} $@ || die   abi-${abi} $@ || die
    193    
    194   # unset this is very important   # unset this is very important
    # Line 203  only-m64() Line 209  only-m64()
    209   # export this for mpatch etc (to repect only-${abi})   # export this for mpatch etc (to repect only-${abi})
    210   export MULTILIB_ONLY_ABI=${abi}   export MULTILIB_ONLY_ABI=${abi}
    211    
    212   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${ABI_DO_NOT_ENTER_SRCDIR} != true ]]
    213     then
    214     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    215     fi
    216   abi-${abi} $@ || die   abi-${abi} $@ || die
    217    
    218   # unset this is very important   # unset this is very important
    # Line 217  all-abis() Line 226  all-abis()
    226   local abi   local abi
    227   for abi in ${MULTILIB_ABIS}   for abi in ${MULTILIB_ABIS}
    228   do   do
    229   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${ABI_DO_NOT_ENTER_SRCDIR} != true ]]
    230     then
    231     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    232     fi
    233   abi-${abi} $@ || die   abi-${abi} $@ || die
    234   done   done
    235  }  }
    # Line 399  cmake_src_install() Line 411  cmake_src_install()
    411   done   done
    412  }  }
    413  fi  fi
       
     if [[ ! -z $(typeset -f mninja) ]]  
     then  
      # rename the old one  
      old_mninja=old$(typeset -f mninja)  
      eval "${old_mninja}"  
       
     mninja()  
     {  
      local abi  
      local abis_to_run="${MULTILIB_ABIS}"  
       
      # respect MULTILIB_ONLY_ABI variable  
      [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"  
       
      for abi in ${abis_to_run}  
      do  
      echo -e "${COLBLUE}*** ${COLGREEN}compiling for ABI -${abi}${COLDEFAULT}"  
      cd ${SRCDIR}-${abi}/${SRCSUBDIR}  
      abi-${abi} oldmninja $@ || die  
      done  
     }  
     fi  
       
     if [[ ! -z $(typeset -f meson_configure) ]]  
     then  
      # rename the old one  
      old_meson_configure=old$(typeset -f meson_configure)  
      eval "${old_meson_configure}"  
       
     meson_configure()  
     {  
      local abi  
      local abis_to_run="${MULTILIB_ABIS}"  
       
      # respect MULTILIB_ONLY_ABI variable  
      [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"  
       
      local saved_SRCDIR="${SRCDIR}"  
      for abi in ${abis_to_run}  
      do  
      SRCDIR="${saved_SRCDIR}-${abi}"  
      # honor inside and outside build-dir builds  
      if [ -d ${BUILDDIR}/build-${abi} ]  
      then  
      cd ${BUILDDIR}/build-${abi}  
      else  
      cd ${SRCDIR}  
      fi  
      abi-${abi} oldmeson_configure $@ || die  
      done  
      # restore SRCDIR  
      SRCDIR="${saved_SRCDIR}"  
     }  
     fi  
       
     if [[ ! -z $(typeset -f meson_src_compile) ]]  
     then  
      # rename the old one  
      old_meson_src_compile=old$(typeset -f meson_src_compile)  
      eval "${old_meson_src_compile}"  
       
     meson_src_compile()  
     {  
      local abi  
      local abis_to_run="${MULTILIB_ABIS}"  
       
      # respect MULTILIB_ONLY_ABI variable  
      [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"  
       
      for abi in ${abis_to_run}  
      do  
      # remove build dir if exist  
      [[ -d ${BUILDDIR}/build-${abi} ]] && rm -rf ${BUILDDIR}/build-${abi}  
       
      # build outside of the source dir  
      install -d ${BUILDDIR}/build-${abi} || die  
      cd ${BUILDDIR}/build-${abi}  
      done  
       
      meson_configure || die  
       
      for abi in ${abis_to_run}  
      do  
      cd ${BUILDDIR}/build-${abi}  
      abi-${abi} oldmninja $@ || die  
      done  
     }  
     fi  
       
     if [[ ! -z $(typeset -f meson_src_check) ]]  
     then  
      # rename the old one  
      old_meson_src_check=old$(typeset -f meson_src_check)  
      eval "${old_meson_check}"  
       
     meson_src_check()  
     {  
      local abi  
      local abis_to_run="${MULTILIB_ABIS}"  
       
      # respect MULTILIB_ONLY_ABI variable  
      [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"  
       
      for abi in ${abis_to_run}  
      do  
      # honor inside and outside build-dir builds  
      if [ -d ${BUILDDIR}/build-${abi} ]  
      then  
      cd ${BUILDDIR}/build-${abi}  
      else  
      cd ${SRCDIR}-${abi}  
      fi  
      meson test || die  
      done  
     }  
     fi  
       
     if [[ ! -z $(typeset -f meson_src_install) ]]  
     then  
      # rename the old one  
      old_meson_src_install=old$(typeset -f meson_src_install)  
      eval "${old_meson_install}"  
       
     meson_src_install()  
     {  
      local abi  
      local abis_to_run="${MULTILIB_ABIS}"  
       
      # respect MULTILIB_ONLY_ABI variable  
      [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"  
       
      for abi in ${abis_to_run}  
      do  
      # honor inside and outside build-dir builds  
      if [ -d ${BUILDDIR}/build-${abi} ]  
      then  
      cd ${BUILDDIR}/build-${abi}  
      else  
      cd ${SRCDIR}-${abi}  
      fi  
      abi-${abi} DESTDIR=${BINDIR} oldmninja $@ install || die  
      done  
     }  
     fi  
    414    
    415  if [[ ! -z $(typeset -f munpack) ]]  if [[ ! -z $(typeset -f munpack) ]]
    416  then  then
    Legend:
    Removed from v.29788  
    changed lines
      Added in v.29792