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 22068 by niro, Fri Aug 22 13:18:50 2014 UTC revision 29788 by niro, Thu Oct 12 08:49:24 2017 UTC
    # Line 42  then Line 42  then
    42   # the var ist decided with our common eval+echo magic   # the var ist decided with our common eval+echo magic
    43   if [[ -z ${SDEPEND} ]]   if [[ -z ${SDEPEND} ]]
    44   then   then
    45   SDEPEND="\$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"   SDEPEND="$(marchsdepend EMUL_LINUX_32_SDEPEND)"
    46   else   else
    47   SDEPEND="${SDEPEND}   SDEPEND="${SDEPEND}
    48   \$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"   $(marchsdepend EMUL_LINUX_32_SDEPEND)"
    49   fi   fi
    50  fi  fi
    51    
    # Line 399  cmake_src_install() Line 399  cmake_src_install()
    399   done   done
    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) ]]
    427    then
    428     # rename the old one
    429     old_meson_configure=old$(typeset -f meson_configure)
    430     eval "${old_meson_configure}"
    431    
    432    meson_configure()
    433    {
    434     local abi
    435     local abis_to_run="${MULTILIB_ABIS}"
    436    
    437     # respect MULTILIB_ONLY_ABI variable
    438     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    439    
    440     local saved_SRCDIR="${SRCDIR}"
    441     for abi in ${abis_to_run}
    442     do
    443     SRCDIR="${saved_SRCDIR}-${abi}"
    444     # honor inside and outside build-dir builds
    445     if [ -d ${BUILDDIR}/build-${abi} ]
    446     then
    447     cd ${BUILDDIR}/build-${abi}
    448     else
    449     cd ${SRCDIR}
    450     fi
    451     abi-${abi} oldmeson_configure $@ || die
    452     done
    453     # restore SRCDIR
    454     SRCDIR="${saved_SRCDIR}"
    455    }
    456    fi
    457    
    458    if [[ ! -z $(typeset -f meson_src_compile) ]]
    459    then
    460     # rename the old one
    461     old_meson_src_compile=old$(typeset -f meson_src_compile)
    462     eval "${old_meson_src_compile}"
    463    
    464    meson_src_compile()
    465    {
    466     local abi
    467     local abis_to_run="${MULTILIB_ABIS}"
    468    
    469     # respect MULTILIB_ONLY_ABI variable
    470     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    471    
    472     for abi in ${abis_to_run}
    473     do
    474     # remove build dir if exist
    475     [[ -d ${BUILDDIR}/build-${abi} ]] && rm -rf ${BUILDDIR}/build-${abi}
    476    
    477     # build outside of the source dir
    478     install -d ${BUILDDIR}/build-${abi} || die
    479     cd ${BUILDDIR}/build-${abi}
    480     done
    481    
    482     meson_configure || die
    483    
    484     for abi in ${abis_to_run}
    485     do
    486     cd ${BUILDDIR}/build-${abi}
    487     abi-${abi} oldmninja $@ || die
    488     done
    489    }
    490    fi
    491    
    492    if [[ ! -z $(typeset -f meson_src_check) ]]
    493    then
    494     # rename the old one
    495     old_meson_src_check=old$(typeset -f meson_src_check)
    496     eval "${old_meson_check}"
    497    
    498    meson_src_check()
    499    {
    500     local abi
    501     local abis_to_run="${MULTILIB_ABIS}"
    502    
    503     # respect MULTILIB_ONLY_ABI variable
    504     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    505    
    506     for abi in ${abis_to_run}
    507     do
    508     # honor inside and outside build-dir builds
    509     if [ -d ${BUILDDIR}/build-${abi} ]
    510     then
    511     cd ${BUILDDIR}/build-${abi}
    512     else
    513     cd ${SRCDIR}-${abi}
    514     fi
    515     meson test || die
    516     done
    517    }
    518    fi
    519    
    520    if [[ ! -z $(typeset -f meson_src_install) ]]
    521    then
    522     # rename the old one
    523     old_meson_src_install=old$(typeset -f meson_src_install)
    524     eval "${old_meson_install}"
    525    
    526    meson_src_install()
    527    {
    528     local abi
    529     local abis_to_run="${MULTILIB_ABIS}"
    530    
    531     # respect MULTILIB_ONLY_ABI variable
    532     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    533    
    534     for abi in ${abis_to_run}
    535     do
    536     # honor inside and outside build-dir builds
    537     if [ -d ${BUILDDIR}/build-${abi} ]
    538     then
    539     cd ${BUILDDIR}/build-${abi}
    540     else
    541     cd ${SRCDIR}-${abi}
    542     fi
    543     abi-${abi} DESTDIR=${BINDIR} oldmninja $@ install || die
    544     done
    545    }
    546    fi
    547    
    548  if [[ ! -z $(typeset -f munpack) ]]  if [[ ! -z $(typeset -f munpack) ]]
    549  then  then
    Legend:
    Removed from v.22068  
    changed lines
      Added in v.29788