--- smage/trunk/include/python2.sminc 2017/12/21 09:39:23 11531 +++ smage/trunk/include/python2.sminc 2019/10/30 12:46:56 13778 @@ -46,6 +46,7 @@ python2_multilib_src_prepare() { munpack ${SRCFILE} || die + local abi for abi in ${MULTILIB_ABIS} do install -d ${MAGE_PYTHON2_SRCSUBDIR} @@ -56,25 +57,31 @@ python2_src_compile() { local saved_SRCDIR="${SRCDIR}" + local saved_MESON_BUILDDIR="${MESON_BUILDDIR}" SRCDIR="${MAGE_PYTHON2_SRCSUBDIR}/$(basename ${saved_SRCDIR})" + MESON_BUILDDIR="${MAGE_PYTHON2_SRCSUBDIR}/build" cd ${SRCDIR} python2_docompile $@ || die SRCDIR="${saved_SRCDIR}" + MESON_BUILDDIR="${saved_MESON_BUILDDIR}" } python2_multilib_src_compile() { local abi local saved_SRCDIR="${SRCDIR}" + local saved_MESON_BUILDDIR="${MESON_BUILDDIR}" for abi in ${MULTILIB_ABIS} do SRCDIR="${MAGE_PYTHON2_SRCSUBDIR}/$(basename ${saved_SRCDIR}-${abi})" + MESON_BUILDDIR="${MAGE_PYTHON2_SRCSUBDIR}/build-${abi}" cd ${SRCDIR} abi-${abi} python2_docompile $@ || die done SRCDIR="${saved_SRCDIR}" + MESON_BUILDDIR="${saved_MESON_BUILDDIR}" } python2_src_check() @@ -85,7 +92,9 @@ python2_src_install() { local saved_SRCDIR="${SRCDIR}" + local saved_MESON_BUILDDIR="${MESON_BUILDDIR}" SRCDIR="${MAGE_PYTHON2_SRCSUBDIR}/$(basename ${saved_SRCDIR})" + MESON_BUILDDIR="${MAGE_PYTHON2_SRCSUBDIR}/build" cd ${SRCDIR} python2_doinstall $@ || die @@ -100,16 +109,19 @@ fi done SRCDIR="${saved_SRCDIR}" + MESON_BUILDDIR="${saved_MESON_BUILDDIR}" } python2_multilib_src_install() { local abi local saved_SRCDIR="${SRCDIR}" + local saved_MESON_BUILDDIR="${MESON_BUILDDIR}" for abi in ${MULTILIB_ABIS} do SRCDIR="${MAGE_PYTHON2_SRCSUBDIR}/$(basename ${saved_SRCDIR}-${abi})" + MESON_BUILDDIR="${MAGE_PYTHON2_SRCSUBDIR}/build-${abi}" cd ${SRCDIR} abi-${abi} python2_doinstall $@ || die @@ -124,6 +136,7 @@ done done SRCDIR="${saved_SRCDIR}" + MESON_BUILDDIR="${saved_MESON_BUILDDIR}" } export_inherits python2 src_check