aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Gilroy <michael.gilroy24@gmail.com>2017-07-13 05:45:41 +0000
committerMichael Gilroy <michael.gilroy24@gmail.com>2017-07-13 05:45:41 +0000
commitd74af347e2b90e505bfe1e5fb1fd8f4d67433006 (patch)
tree23b9388990b98780465e8d44a03a31b7cae8c0da
parentupdated src_* with multilib options (diff)
downloadgentoo-mpi-d74af347e2b90e505bfe1e5fb1fd8f4d67433006.tar.gz
gentoo-mpi-d74af347e2b90e505bfe1e5fb1fd8f4d67433006.tar.bz2
gentoo-mpi-d74af347e2b90e505bfe1e5fb1fd8f4d67433006.zip
fixed function call errors, added to src_installHEADmaster
-rw-r--r--eclass/mpi-select.eclass31
1 files changed, 25 insertions, 6 deletions
diff --git a/eclass/mpi-select.eclass b/eclass/mpi-select.eclass
index 968f797..ef1eb29 100644
--- a/eclass/mpi-select.eclass
+++ b/eclass/mpi-select.eclass
@@ -153,7 +153,7 @@ mpi_src_configure()
einfo "hit openmpi"
fi
- mpi_src_configure()
+ mpi-select_src_configure()
{
mkdir -p "${BUILD_DIR}" || die
pushd "${BUILD_DIR}" > /dev/null || die
@@ -166,7 +166,7 @@ mpi_src_configure()
popd > /dev/null || die
}
- multilib_foreach_variant mpi_src_configure
+ multilib_foreach_variant mpi-select_src_configure
}
mpi_src_compile()
@@ -179,7 +179,7 @@ mpi_src_compile()
einfo "hit openmpi"
fi
- mpi_src_compile()
+ mpi-select_src_compile()
{
mkdir -p "${BUILD_DIR}" || die
pushd "${BUILD_DIR}" > /dev/null || die
@@ -192,14 +192,14 @@ mpi_src_compile()
popd > /dev/null || die
}
- multilib_foreach_variant mpi_src_compile
+ multilib_foreach_variant mpi-select_src_compile
}
mpi_src_test()
{
emake -j1 check
- mpi_src_test()
+ mpi-select_src_test()
{
mkdir -p "${BUILD_DIR}" || die
pushd "${BUILD_DIR}" > /dev/null || die
@@ -212,7 +212,7 @@ mpi_src_test()
popd > /dev/null || die
}
- multilib_foreach_variant mpi_src_test
+ multilib_foreach_variant mpi-select_src_test
}
mpi_src_install()
@@ -233,4 +233,23 @@ mpi_src_install()
done
find . -type d -empty -delete || die "could not delete empty directories"
+
+ mpi-select_src_install()
+ {
+ mkdir -p "${BUILD_DIR}" || die
+ pushd "${BUILD_DIR}" > /dev/null || die
+ if declare -f multilib_src_test > /dev/null ; then
+ emake DESTDIR="${D}" install
+ else
+ default_src_test
+ fi
+
+ popd > /dev/null || die
+ }
+
+ multilib_foreach_variant mpi-select_src_install
+
+
+ # TODO: proper conditional for einstalldocs
+ einstalldocs
}