| 1 |
commit: be6ba927d05edc1494cc9afa23c4bbbda070ba0e |
| 2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Sep 7 07:26:01 2021 +0000 |
| 4 |
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 7 10:47:49 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=be6ba927 |
| 7 |
|
| 8 |
sys-cluster/nanos6: babeltrace use, no test with mercurium |
| 9 |
|
| 10 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
| 11 |
|
| 12 |
.../{nanos6-2.6-r3.ebuild => nanos6-2.6-r4.ebuild} | 26 +++++++++++----------- |
| 13 |
1 file changed, 13 insertions(+), 13 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-cluster/nanos6/nanos6-2.6-r3.ebuild b/sys-cluster/nanos6/nanos6-2.6-r4.ebuild |
| 16 |
similarity index 85% |
| 17 |
rename from sys-cluster/nanos6/nanos6-2.6-r3.ebuild |
| 18 |
rename to sys-cluster/nanos6/nanos6-2.6-r4.ebuild |
| 19 |
index 428c57be5..dca1a609a 100644 |
| 20 |
--- a/sys-cluster/nanos6/nanos6-2.6-r3.ebuild |
| 21 |
+++ b/sys-cluster/nanos6/nanos6-2.6-r4.ebuild |
| 22 |
@@ -13,9 +13,9 @@ S="${WORKDIR}/${PN}-version-${PV}" |
| 23 |
LICENSE="GPL-3" |
| 24 |
SLOT="0" |
| 25 |
KEYWORDS="~amd64" |
| 26 |
-IUSE="debug dlb execution-workflow extrae memkind mercurium papi pqos test unwind" |
| 27 |
-#jemalloc require custom stuff |
| 28 |
-#TODO: cuda babeltrace2 |
| 29 |
+IUSE="babeltrace debug dlb execution-workflow extrae memkind mercurium papi pqos test unwind" |
| 30 |
+#jemalloc require custom jemalloc |
| 31 |
+#TODO: cuda |
| 32 |
#TODO: llvm-libunwind |
| 33 |
|
| 34 |
RDEPEND=" |
| 35 |
@@ -24,6 +24,7 @@ RDEPEND=" |
| 36 |
sys-process/numactl |
| 37 |
virtual/libelf |
| 38 |
|
| 39 |
+ babeltrace? ( dev-util/babeltrace2 ) |
| 40 |
dlb? ( sys-cluster/dlb ) |
| 41 |
extrae? ( sys-cluster/extrae[nanos] ) |
| 42 |
memkind? ( dev-libs/memkind ) |
| 43 |
@@ -32,13 +33,12 @@ RDEPEND=" |
| 44 |
pqos? ( sys-apps/intel-cmt-cat ) |
| 45 |
unwind? ( sys-libs/libunwind ) |
| 46 |
" |
| 47 |
-# jemalloc? ( dev-libs/jemalloc ) |
| 48 |
DEPEND="${RDEPEND}" |
| 49 |
|
| 50 |
PATCHES=( "${FILESDIR}/${P}-include-string.patch" ) |
| 51 |
-# https://github.com/bsc-pm/nanos6/issues/3 |
| 52 |
-RESTRICT="test" |
| 53 |
-#RESTRICT="!test? ( test )" |
| 54 |
+RESTRICT="!test? ( test )" |
| 55 |
+REQUIRED_USE="test? ( !mercurium )" # https://github.com/bsc-pm/nanos6/issues/3 |
| 56 |
+ |
| 57 |
|
| 58 |
src_prepare() { |
| 59 |
default |
| 60 |
@@ -55,7 +55,6 @@ src_configure() { |
| 61 |
|
| 62 |
--with-boost="${EPREFIX}/usr" |
| 63 |
--with-libnuma="${EPREFIX}/usr" |
| 64 |
- --with-pic |
| 65 |
|
| 66 |
--without-git |
| 67 |
--without-k1om |
| 68 |
@@ -64,15 +63,16 @@ src_configure() { |
| 69 |
|
| 70 |
$(use_enable debug extra-debug) |
| 71 |
) |
| 72 |
+ |
| 73 |
use dlb && myconf+=( "--with-dlb=${EPREFIX}/usr" ) |
| 74 |
use memkind && myconf+=( "--with-memkind=${EPREFIX}/usr" ) |
| 75 |
use pqos && myconf+=( "--with-pqos=${EPREFIX}/usr" ) |
| 76 |
|
| 77 |
-# if use babeltrace; then |
| 78 |
-# myconf+=( "--with-babeltrace2=${EPREFIX}/usr" ) |
| 79 |
-# else |
| 80 |
-# myconf+=( "--without-babeltrace2" ) |
| 81 |
-# fi |
| 82 |
+ if use babeltrace; then |
| 83 |
+ myconf+=( "--with-babeltrace2=${EPREFIX}/usr" ) |
| 84 |
+ else |
| 85 |
+ myconf+=( "--without-babeltrace2" ) |
| 86 |
+ fi |
| 87 |
if use extrae; then |
| 88 |
myconf+=( "--with-extrae=${EPREFIX}/usr" ) |
| 89 |
else |
Archives