Magellan Linux

  • Back to homepage
    • /[smage]/trunk/include/meson.sminc

    Diff of /trunk/include/meson.sminc

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

    revision 31578 by niro, Wed May 16 08:06:56 2018 UTC revision 31579 by niro, Mon Dec 3 09:18:38 2018 UTC
    # Line 90  meson_configure() Line 90  meson_configure()
    90    
    91  mninja()  mninja()
    92  {  {
    93     local abi
    94     local abis_to_run="${MULTILIB_ABIS}"
    95    
    96     # respect MULTILIB_ONLY_ABI variable
    97     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    98    
    99   if [[ ${MULTILIB_BUILD} = true ]]   if [[ ${MULTILIB_BUILD} = true ]]
    100   then   then
    101   all-abis ninja -C ${SRCDIR}-$(mabi)/${SRCSUBDIR} -C ${BUILDDIR}/build-$(mabi) -v ${MAKEOPTS} "$@"   for abi in ${abis_to_run}
    102     do
    103     echo -e "${COLBLUE}*** ${COLGREEN}running ninja for ABI -${abi}${COLDEFAULT}"
    104     abi-${abi} ninja -C ${SRCDIR}-$(mabi)/${SRCSUBDIR} -C ${BUILDDIR}/build-$(mabi) -v ${MAKEOPTS} "$@"
    105     done
    106   else   else
    107   ninja -C ${SRCDIR}/${SRCSUBDIR} -C ${BUILDDIR}/build -v ${MAKEOPTS} "$@"   ninja -C ${SRCDIR}/${SRCSUBDIR} -C ${BUILDDIR}/build -v ${MAKEOPTS} "$@"
    108   fi   fi
    # Line 100  mninja() Line 110  mninja()
    110    
    111  meson_setup_builddir()  meson_setup_builddir()
    112  {  {
    113     local abi
    114     local abis_to_run="${MULTILIB_ABIS}"
    115    
    116     # respect MULTILIB_ONLY_ABI variable
    117     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    118    
    119   if [[ ${MULTILIB_BUILD} = true ]]   if [[ ${MULTILIB_BUILD} = true ]]
    120   then   then
    121   all-abis install -d ${BUILDDIR}/build-$(mabi) || die   for abi in ${abis_to_run}
    122     do
    123     echo -e "${COLBLUE}*** ${COLGREEN}running ninja for ABI -${abi}${COLDEFAULT}"
    124     abi-${abi} install -d ${BUILDDIR}/build-$(mabi) || die
    125     done
    126   else   else
    127   install -d ${BUILDDIR}/build || die   install -d ${BUILDDIR}/build || die
    128   fi   fi
    Legend:
    Removed from v.31578  
    changed lines
      Added in v.31579