commit: ac36f2e6ff4e0c5971604cc69ac1f0a9bda16241 Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de> AuthorDate: Sun Mar 15 18:58:58 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Wed Mar 25 11:17:03 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac36f2e6
sys-cluster/hpx: Sync live ebuild Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de> Closes: https://github.com/gentoo/gentoo/pull/14990 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> sys-cluster/hpx/hpx-9999.ebuild | 67 +++++++++++++++++++++++++++++------------ 1 file changed, 48 insertions(+), 19 deletions(-) diff --git a/sys-cluster/hpx/hpx-9999.ebuild b/sys-cluster/hpx/hpx-9999.ebuild index d075974e0bd..5abc3de483f 100644 --- a/sys-cluster/hpx/hpx-9999.ebuild +++ b/sys-cluster/hpx/hpx-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6..8} ) if [[ ${PV} == 9999 ]] ; then inherit git-r3 @@ -11,9 +11,8 @@ if [[ ${PV} == 9999 ]] ; then else SRC_URI="https://stellar.cct.lsu.edu/files/${PN}_${PV}.tar.gz"; KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - S="${WORKDIR}/${PN}_${PV}" fi -inherit cmake fortran-2 python-any-r1 +inherit cmake fortran-2 python-single-r1 check-reqs DESCRIPTION="C++ runtime system for parallel and distributed applications" HOMEPAGE="https://stellar.cct.lsu.edu/tag/hpx/"; @@ -23,27 +22,55 @@ LICENSE="Boost-1.0" IUSE="doc examples jemalloc papi +perftools tbb test" RESTRICT="!test? ( test )" -REQUIRED_USE="?? ( jemalloc perftools tbb )" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + ?? ( jemalloc perftools tbb ) +" BDEPEND=" virtual/pkgconfig - doc? ( >=dev-libs/boost-1.56.0-r1[tools] ) + doc? ( + ${PYTHON_DEPS} + app-doc/doxygen + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_MULTI_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}] + >=dev-python/breathe-4.14[${PYTHON_MULTI_USEDEP}] + ') + ) + test? ( ${PYTHON_DEPS} ) " RDEPEND=" - >=dev-libs/boost-1.49:= - >=sys-apps/hwloc-1.8 - >=sys-libs/libunwind-1 + ${PYTHON_DEPS} + dev-libs/boost:= + sys-apps/hwloc sys-libs/zlib papi? ( dev-libs/papi ) - perftools? ( >=dev-util/google-perftools-1.7.1 ) + perftools? ( dev-util/google-perftools ) tbb? ( dev-cpp/tbb ) " -DEPEND="${RDEPEND} - test? ( ${PYTHON_DEPS} ) -" +DEPEND="${RDEPEND}" + +hpx_memory_requirement() { + # HPX needs enough main memory for compiling + # rule of thumb: 1G per job + if [[ -z ${MAKEOPTS} ]] ; then + echo "2G" + else + local jobs=`echo ${MAKEOPTS} | cut -d j -f 2` + echo "${jobs}G" + fi +} + +pkg_pretend() { + local CHECKREQS_MEMORY=$(hpx_memory_requirement) + check-reqs_pkg_setup +} pkg_setup() { - use test && python-any-r1_pkg_setup + local CHECKREQS_MEMORY=$(hpx_memory_requirement) + check-reqs_pkg_setup + python-single-r1_pkg_setup } src_configure() { @@ -67,16 +94,18 @@ src_configure() { cmake_src_configure } +src_compile() { + cmake_src_compile + use test && cmake_build tests +} + src_test() { # avoid over-suscribing - cmake_build -j1 tests + cmake_src_test -j1 } src_install() { cmake_src_install - if use examples; then - mv "${D}/usr/bin/spin" "${D}/usr/bin/hpx_spin" || die - insinto /usr/share/doc/${PF} - doins -r examples - fi + use examples && dodoc -r examples/ + python_fix_shebang "${ED}" }
