Gentoo Archives: gentoo-commits

From: Alessandro Barbieri <lssndrbarbieri@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/nanox/, profiles/desc/
Date: Fri, 27 May 2022 11:28:18
Message-Id: 1653650887.3675955f3913b0b8bf5e3fc7499c40668b241c9d.Alessandro-Barbieri@gentoo
1 commit: 3675955f3913b0b8bf5e3fc7499c40668b241c9d
2 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
3 AuthorDate: Thu May 26 23:46:26 2022 +0000
4 Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
5 CommitDate: Fri May 27 11:28:07 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3675955f
7
8 sys-cluster/nanox: move NANOX use expand to profiles/desc
9
10 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
11
12 profiles/desc/nanox.desc | 9 +++++++++
13 sys-cluster/nanox/metadata.xml | 4 ----
14 sys-cluster/nanox/nanox-0.15_p20210818.ebuild | 22 +++++++++++-----------
15 3 files changed, 20 insertions(+), 15 deletions(-)
16
17 diff --git a/profiles/desc/nanox.desc b/profiles/desc/nanox.desc
18 new file mode 100644
19 index 000000000..d83e3d277
20 --- /dev/null
21 +++ b/profiles/desc/nanox.desc
22 @@ -0,0 +1,9 @@
23 +# Copyright 2022 Gentoo Authors
24 +# Distributed under the terms of the GNU General Public License v2
25 +
26 +# This file contains descriptions of NANOX USE_EXPAND flags.
27 +
28 +debug - Enable generation of debug version
29 +instrumentation - Enable generation of instrumentation version
30 +instrumentation-debug - Enable generation of instrumentation-debug version
31 +performance - Enable generation of performance version
32
33 diff --git a/sys-cluster/nanox/metadata.xml b/sys-cluster/nanox/metadata.xml
34 index d1592a53a..d895502d8 100644
35 --- a/sys-cluster/nanox/metadata.xml
36 +++ b/sys-cluster/nanox/metadata.xml
37 @@ -25,10 +25,6 @@ The main purpose of Nanos++ RTL is to be used in research of parallel programmin
38 <flag name="hwloc">Enable <pkg>sys-apps/hwloc</pkg> support</flag>
39 <flag name="memkind">Enables <pkg>dev-libs/memkind</pkg> support</flag>
40 <flag name="memtracker">Enables Memtracker module</flag>
41 - <flag name="nanox-debug">Enable generation of debug version</flag>
42 - <flag name="nanox-instrumentation">Enable generation of instrumentation version</flag>
43 - <flag name="nanox-instrumentation-debug">Enable generation of instrumentation-debug version</flag>
44 - <flag name="nanox-performance">Enable generation of performance version</flag>
45 <flag name="opencl">Enables openCL support</flag>
46 <flag name="papi">enable <pkg>dev-libs/papi</pkg> support</flag>
47 <flag name="resiliency">Enables task-level resiliency</flag>
48
49 diff --git a/sys-cluster/nanox/nanox-0.15_p20210818.ebuild b/sys-cluster/nanox/nanox-0.15_p20210818.ebuild
50 index ec0e42602..9d5a99069 100644
51 --- a/sys-cluster/nanox/nanox-0.15_p20210818.ebuild
52 +++ b/sys-cluster/nanox/nanox-0.15_p20210818.ebuild
53 @@ -1,4 +1,4 @@
54 -# Copyright 2019-2021 Gentoo Authors
55 +# Copyright 2019-2022 Gentoo Authors
56 # Distributed under the terms of the GNU General Public License v2
57
58 EAPI=8
59 @@ -22,10 +22,10 @@ LICENSE="LGPL-3"
60 SLOT="0"
61 KEYWORDS="~amd64"
62 IUSE_NANOX="
63 - nanox-debug
64 - +nanox-instrumentation
65 - nanox-instrumentation-debug
66 - +nanox-performance
67 + nanox_debug
68 + +nanox_instrumentation
69 + nanox_instrumentation-debug
70 + +nanox_performance
71 "
72 IUSE="${IUSE_NANOX} allocator ayudame dlb +extrae gasnet hwloc memkind memtracker mpi opencl papi sqlite resiliency task-callback +threads"
73
74 @@ -52,8 +52,8 @@ DEPEND="
75 PATCHES=( "${FILESDIR}/${PN}-no-Werror.patch" )
76 REQUIRED_USE="
77 || ( ${IUSE_NANOX//+/} )
78 - nanox-instrumentation? ( extrae )
79 - nanox-instrumentation-debug? ( extrae )
80 + nanox_instrumentation? ( extrae )
81 + nanox_instrumentation-debug? ( extrae )
82 "
83
84 src_prepare() {
85 @@ -79,10 +79,10 @@ src_configure() {
86
87 $(use_enable allocator)
88 $(use_enable memtracker)
89 - $(use_enable nanox-debug debug)
90 - $(use_enable nanox-instrumentation instrumentation)
91 - $(use_enable nanox-instrumentation-debug instrumentation-debug)
92 - $(use_enable nanox-performance performance)
93 + $(use_enable nanox_debug debug)
94 + $(use_enable nanox_instrumentation instrumentation)
95 + $(use_enable nanox_instrumentation-debug instrumentation-debug)
96 + $(use_enable nanox_performance performance)
97 $(use_enable resiliency)
98 $(use_enable task-callback)
99 $(use_enable threads ult)