1 |
commit: c798d2ce3a3d145fb8c605ba15105b0f0e2e01eb |
2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu May 26 23:38:29 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=c798d2ce |
7 |
|
8 |
sys-cluster/veloc: move COMM_QUEUE use expand to profiles/desc |
9 |
|
10 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
11 |
|
12 |
profiles/desc/comm_queue.desc | 8 ++++++++ |
13 |
sys-cluster/veloc/metadata.xml | 3 --- |
14 |
sys-cluster/veloc/veloc-1.6.ebuild | 16 ++++++++-------- |
15 |
3 files changed, 16 insertions(+), 11 deletions(-) |
16 |
|
17 |
diff --git a/profiles/desc/comm_queue.desc b/profiles/desc/comm_queue.desc |
18 |
new file mode 100644 |
19 |
index 000000000..2e0edd5e1 |
20 |
--- /dev/null |
21 |
+++ b/profiles/desc/comm_queue.desc |
22 |
@@ -0,0 +1,8 @@ |
23 |
+# Copyright 2022 Gentoo Authors |
24 |
+# Distributed under the terms of the GNU General Public License v2 |
25 |
+ |
26 |
+# This file contains descriptions of COMM_QUEUE USE_EXPAND flags. |
27 |
+ |
28 |
+ipc - Use ipc as the communication protocol between client library and active backend |
29 |
+socket - Use socket as the communication protocol between client library and active backend |
30 |
+thallium - Use thallium as the communication protocol between client library and active backend |
31 |
|
32 |
diff --git a/sys-cluster/veloc/metadata.xml b/sys-cluster/veloc/metadata.xml |
33 |
index 15c4fdb60..fd2726855 100644 |
34 |
--- a/sys-cluster/veloc/metadata.xml |
35 |
+++ b/sys-cluster/veloc/metadata.xml |
36 |
@@ -14,8 +14,5 @@ VeloC is a collaboration between Argonne National Laboratory and Lawrence Liverm |
37 |
</longdescription> |
38 |
<use> |
39 |
<flag name="slurm">Use <pkg>sys-cluster/slurm</pkg> as resource manager</flag> |
40 |
- <flag name="comm-queue-ipc">Use ipc as the communication protocol between client library and active backend</flag> |
41 |
- <flag name="comm-queue-socket">Use socket as the communication protocol between client library and active backend</flag> |
42 |
- <!--<flag name="comm-queue-thallium">Use as the communication protocol between client library and active backend</flag>--> |
43 |
</use> |
44 |
</pkgmetadata> |
45 |
|
46 |
diff --git a/sys-cluster/veloc/veloc-1.6.ebuild b/sys-cluster/veloc/veloc-1.6.ebuild |
47 |
index 9132559a1..79255c572 100644 |
48 |
--- a/sys-cluster/veloc/veloc-1.6.ebuild |
49 |
+++ b/sys-cluster/veloc/veloc-1.6.ebuild |
50 |
@@ -18,15 +18,15 @@ SLOT="0" |
51 |
KEYWORDS="~amd64" |
52 |
|
53 |
IUSE_COMM_QUEUE=" |
54 |
- +comm-queue-ipc |
55 |
- comm-queue-socket |
56 |
+ +comm_queue_ipc |
57 |
+ comm_queue_socket |
58 |
" |
59 |
-# comm-queue-thallium |
60 |
+# comm_queue_thallium |
61 |
IUSE="${IUSE_COMM_QUEUE} python +slurm" |
62 |
|
63 |
# AXL is optional |
64 |
RDEPEND=" |
65 |
- comm-queue-ipc? ( dev-libs/boost ) |
66 |
+ comm_queue_ipc? ( dev-libs/boost ) |
67 |
slurm? ( sys-cluster/slurm ) |
68 |
|
69 |
dev-libs/openssl |
70 |
@@ -34,7 +34,7 @@ RDEPEND=" |
71 |
sys-cluster/er |
72 |
virtual/mpi |
73 |
" |
74 |
-# comm-queue-thallium? ( thallium ) |
75 |
+# comm_queue_thallium? ( thallium ) |
76 |
DEPEND="${RDEPEND}" |
77 |
|
78 |
PATCHES=( "${FILESDIR}/${P}-strip-cflags.patch" ) |
79 |
@@ -54,9 +54,9 @@ src_configure() { |
80 |
use slurm && resman="SLURM" |
81 |
|
82 |
local queue |
83 |
- use comm-queue-ipc && queue="ipc_queue" |
84 |
- use comm-queue-socket && queue="socket_queue" |
85 |
-# use comm-queue-thallium && queue="thallium_queue" |
86 |
+ use comm_queue_ipc && queue="ipc_queue" |
87 |
+ use comm_queue_socket && queue="socket_queue" |
88 |
+# use comm_queue_thallium && queue="thallium_queue" |
89 |
|
90 |
local mycmakeargs=( |
91 |
-DCMAKE_INSTALL_LIBDIR="$(get_libdir)" |