Index: multilib-minimal.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-minimal.eclass,v retrieving revision 1.9 diff -u -r1.9 multilib-minimal.eclass --- multilib-minimal.eclass 2 May 2014 16:16:37 -0000 1.9 +++ multilib-minimal.eclass 23 Oct 2014 20:24:23 -0000 @@ -30,7 +30,7 @@ esac
-inherit eutils multilib-build +inherit eutils multibuild multilib-build EXPORT_FUNCTIONS src_configure src_compile src_test src_install @@ -41,17 +41,14 @@ multilib-minimal_abi_src_configure() { debug-print-function ${FUNCNAME} "$@" - mkdir -p "${BUILD_DIR}" || die - 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_parallel_foreach_abi multilib-minimal_abi_src_configure + multilib_parallel_foreach_abi run_in_build_dir multilib-minimal_abi_src_configure } multilib-minimal_src_compile() { @@ -60,16 +57,14 @@ multilib-minimal_abi_src_compile() { debug-print-function ${FUNCNAME} "$@" - 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 run_in_build_dir multilib-minimal_abi_src_compile } multilib-minimal_src_test() { @@ -78,16 +73,14 @@ multilib-minimal_abi_src_test() { debug-print-function ${FUNCNAME} "$@" - 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 run_in_build_dir multilib-minimal_abi_src_test } multilib-minimal_src_install() { @@ -96,7 +89,6 @@ multilib-minimal_abi_src_install() { debug-print-function ${FUNCNAME} "$@" - pushd "${BUILD_DIR}" >/dev/null || die if declare -f multilib_src_install >/dev/null ; then multilib_src_install else @@ -111,9 +103,8 @@ multilib_prepare_wrappers multilib_check_headers - popd >/dev/null || die } - multilib_foreach_abi multilib-minimal_abi_src_install + multilib_foreach_abi run_in_build_dir multilib-minimal_abi_src_install multilib_install_wrappers if declare -f multilib_src_install_all >/dev/null ; then
multilib-minimal.patch
Description: Binary data