commit: be6ba927d05edc1494cc9afa23c4bbbda070ba0e
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Tue Sep 7 07:26:01 2021 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 7 10:47:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=be6ba927
sys-cluster/nanos6: babeltrace use, no test with mercurium
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
.../{nanos6-2.6-r3.ebuild => nanos6-2.6-r4.ebuild} | 26 +++++++++++-----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/sys-cluster/nanos6/nanos6-2.6-r3.ebuild
b/sys-cluster/nanos6/nanos6-2.6-r4.ebuild
similarity index 85%
rename from sys-cluster/nanos6/nanos6-2.6-r3.ebuild
rename to sys-cluster/nanos6/nanos6-2.6-r4.ebuild
index 428c57be5..dca1a609a 100644
--- a/sys-cluster/nanos6/nanos6-2.6-r3.ebuild
+++ b/sys-cluster/nanos6/nanos6-2.6-r4.ebuild
@@ -13,9 +13,9 @@ S="${WORKDIR}/${PN}-version-${PV}"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="debug dlb execution-workflow extrae memkind mercurium papi pqos test
unwind"
-#jemalloc require custom stuff
-#TODO: cuda babeltrace2
+IUSE="babeltrace debug dlb execution-workflow extrae memkind mercurium papi
pqos test unwind"
+#jemalloc require custom jemalloc
+#TODO: cuda
#TODO: llvm-libunwind
RDEPEND="
@@ -24,6 +24,7 @@ RDEPEND="
sys-process/numactl
virtual/libelf
+ babeltrace? ( dev-util/babeltrace2 )
dlb? ( sys-cluster/dlb )
extrae? ( sys-cluster/extrae[nanos] )
memkind? ( dev-libs/memkind )
@@ -32,13 +33,12 @@ RDEPEND="
pqos? ( sys-apps/intel-cmt-cat )
unwind? ( sys-libs/libunwind )
"
-# jemalloc? ( dev-libs/jemalloc )
DEPEND="${RDEPEND}"
PATCHES=( "${FILESDIR}/${P}-include-string.patch" )
-# https://github.com/bsc-pm/nanos6/issues/3
-RESTRICT="test"
-#RESTRICT="!test? ( test )"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( !mercurium )" # https://github.com/bsc-pm/nanos6/issues/3
+
src_prepare() {
default
@@ -55,7 +55,6 @@ src_configure() {
--with-boost="${EPREFIX}/usr"
--with-libnuma="${EPREFIX}/usr"
- --with-pic
--without-git
--without-k1om
@@ -64,15 +63,16 @@ src_configure() {
$(use_enable debug extra-debug)
)
+
use dlb && myconf+=( "--with-dlb=${EPREFIX}/usr" )
use memkind && myconf+=( "--with-memkind=${EPREFIX}/usr" )
use pqos && myconf+=( "--with-pqos=${EPREFIX}/usr" )
-# if use babeltrace; then
-# myconf+=( "--with-babeltrace2=${EPREFIX}/usr" )
-# else
-# myconf+=( "--without-babeltrace2" )
-# fi
+ if use babeltrace; then
+ myconf+=( "--with-babeltrace2=${EPREFIX}/usr" )
+ else
+ myconf+=( "--without-babeltrace2" )
+ fi
if use extrae; then
myconf+=( "--with-extrae=${EPREFIX}/usr" )
else
