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 29795 by niro, Thu Oct 12 11:55:58 2017 UTC
    # Line 113  abi-m32() Line 113  abi-m32()
    113   fi   fi
    114    
    115   # run any given command   # run any given command
    116     if [[ ${MULTILIB_VERBOSE} = true ]]
    117     then
    118     echo -e "${COLGREEN}Executing:${COLDEFAULT} '$@'"
    119     fi
    120   eval $@ || die   eval $@ || die
    121    
    122   unset ABI CC CXX ABI_LIBDIR   unset ABI CC CXX ABI_LIBDIR
    # Line 162  abi-m64() Line 166  abi-m64()
    166   fi   fi
    167    
    168   # run any given command   # run any given command
    169     if [[ ${MULTILIB_VERBOSE} = true ]]
    170     then
    171     echo -e "${COLGREEN}Executing:${COLDEFAULT} '$@'"
    172     fi
    173   eval $@ || die   eval $@ || die
    174    
    175   unset ABI CC CXX ABI_LIBDIR   unset ABI CC CXX ABI_LIBDIR
    # Line 399  cmake_src_install() Line 407  cmake_src_install()
    407   done   done
    408  }  }
    409  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  
    410    
    411  if [[ ! -z $(typeset -f munpack) ]]  if [[ ! -z $(typeset -f munpack) ]]
    412  then  then
    Legend:
    Removed from v.29788  
    changed lines
      Added in v.29795