--- trunk/include/python.sminc 2019/10/21 10:06:01 33241 +++ trunk/include/python.sminc 2019/10/23 11:27:48 33281 @@ -75,8 +75,10 @@ ${MAGE_PYTHON_EXEC} waf build $@ || die elif [[ -e meson.build ]] then - meson_configure -D python=${MAGE_PYTHON_EXEC} || die - mninja || die + # never run multilib builds here, multilib will be enabled by python_multilib_src_compile + # this honors the logic of other build methods (python, waf, autotools) + MULTILIB_BUILD=false meson_configure -D python=${MAGE_PYTHON_EXEC} || die + MULTILIB_BUILD=false mninja || die elif [[ -e configure ]] then if [[ ${MULTILIB_BUILD} = true ]] && [[ ! -z $(typeset -f oldmconfigure) ]] && [[ ! -z $(typeset -f oldmmake) ]] @@ -105,7 +107,9 @@ ${MAGE_PYTHON_EXEC} waf install --destdir=${BINDIR} $@ || die elif [[ -e meson.build ]] then - DESTDIR=${BINDIR} mninja install || die + # never run multilib builds here, multilib will be enabled by python_multilib_src_compile + # this honors the logic of other build methods (python, waf, autotools) + MULTILIB=false DESTDIR=${BINDIR} mninja install || die elif [[ -e install.py ]] then ${MAGE_PYTHON_EXEC} install.py --prefix=/usr --files-only --destdir=${BINDIR} $@ || die