--- gx86/eclass/multilib-minimal.eclass | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/gx86/eclass/multilib-minimal.eclass b/gx86/eclass/multilib-minimal.eclass index a77368e..2510578 100644 --- a/gx86/eclass/multilib-minimal.eclass +++ b/gx86/eclass/multilib-minimal.eclass @@ -35,6 +35,10 @@ inherit multibuild multilib-build EXPORT_FUNCTIONS src_configure src_compile src_test src_install +_multilib-minimal_wrap_phase() { + run_in_build_dir "${@}" +} + multilib-minimal_src_configure() { _multilib-minimal_mkdir() { mkdir -p "${BUILD_DIR}" || die @@ -42,58 +46,50 @@ multilib-minimal_src_configure() { multilib_foreach_abi _multilib-minimal_mkdir multilib-minimal_abi_src_configure() { - pushd "${BUILD_DIR}" >/dev/null || die if declare -f multilib_src_configure >/dev/null ; then multilib_src_configure else default_src_configure fi - popd >/dev/null || die } - multilib_foreach_abi multilib-minimal_abi_src_configure + multilib_foreach_abi _multilib-minimal_wrap_phase multilib-minimal_abi_src_configure } multilib-minimal_src_compile() { multilib-minimal_abi_src_compile() { - pushd "${BUILD_DIR}" >/dev/null || die if declare -f multilib_src_compile >/dev/null ; then multilib_src_compile else default_src_compile fi - popd >/dev/null || die } - multilib_foreach_abi multilib-minimal_abi_src_compile + multilib_foreach_abi _multilib-minimal_wrap_phase multilib-minimal_abi_src_compile } multilib-minimal_src_test() { multilib-minimal_abi_src_test() { - pushd "${BUILD_DIR}" >/dev/null || die if declare -f multilib_src_test >/dev/null ; then multilib_src_test else default_src_test fi - popd >/dev/null || die } - multilib_foreach_abi multilib-minimal_abi_src_test + multilib_foreach_abi _multilib-minimal_wrap_phase multilib-minimal_abi_src_test } multilib-minimal_src_install() { multilib-minimal_abi_src_install() { - pushd "${BUILD_DIR}" >/dev/null || die if declare -f multilib_src_install >/dev/null ; then multilib_src_install else default_src_install fi multilib_check_headers - popd >/dev/null || die } - multilib_foreach_abi multilib-minimal_abi_src_install + multilib_foreach_abi _multilib-minimal_wrap_phase multilib-minimal_abi_src_install if declare -f multilib_src_install_all >/dev/null ; then multilib_src_install_all -- 1.8.1.5