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 29786 by niro, Thu Oct 12 07:24:27 2017 UTC revision 29788 by niro, Thu Oct 12 08:49:24 2017 UTC
    # Line 400  cmake_src_install() Line 400  cmake_src_install()
    400  }  }
    401  fi  fi
    402    
    403    if [[ ! -z $(typeset -f mninja) ]]
    404    then
    405     # rename the old one
    406     old_mninja=old$(typeset -f mninja)
    407     eval "${old_mninja}"
    408    
    409    mninja()
    410    {
    411     local abi
    412     local abis_to_run="${MULTILIB_ABIS}"
    413    
    414     # respect MULTILIB_ONLY_ABI variable
    415     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    416    
    417     for abi in ${abis_to_run}
    418     do
    419     echo -e "${COLBLUE}*** ${COLGREEN}compiling for ABI -${abi}${COLDEFAULT}"
    420     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    421     abi-${abi} oldmninja $@ || die
    422     done
    423    }
    424    fi
    425    
    426  if [[ ! -z $(typeset -f meson_configure) ]]  if [[ ! -z $(typeset -f meson_configure) ]]
    427  then  then
    # Line 462  meson_src_compile() Line 484  meson_src_compile()
    484   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    485   do   do
    486   cd ${BUILDDIR}/build-${abi}   cd ${BUILDDIR}/build-${abi}
    487   abi-${abi} ninja $@ || die   abi-${abi} oldmninja $@ || die
    488   done   done
    489  }  }
    490  fi  fi
    # Line 518  meson_src_install() Line 540  meson_src_install()
    540   else   else
    541   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}
    542   fi   fi
    543   abi-${abi} DESTDIR=${BINDIR} ninja $@ install || die   abi-${abi} DESTDIR=${BINDIR} oldmninja $@ install || die
    544   done   done
    545  }  }
    546  fi  fi
    547    
       
    548  if [[ ! -z $(typeset -f munpack) ]]  if [[ ! -z $(typeset -f munpack) ]]
    549  then  then
    550   # rename the old one   # rename the old one
    Legend:
    Removed from v.29786  
    changed lines
      Added in v.29788