1 |
commit: a86bb28d574855d9f9c81ddc681402ff7585f40a |
2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Mar 31 17:54:18 2022 +0000 |
4 |
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
5 |
CommitDate: Thu Mar 31 17:57:18 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a86bb28d |
7 |
|
8 |
sys-cluster/veloc: fix AXL dependency |
9 |
|
10 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
11 |
|
12 |
sys-cluster/veloc/Manifest | 1 - |
13 |
sys-cluster/veloc/files/veloc-strip-cflags.patch | 11 --- |
14 |
sys-cluster/veloc/veloc-1.5-r1.ebuild | 105 ----------------------- |
15 |
sys-cluster/veloc/veloc-1.6.ebuild | 2 +- |
16 |
4 files changed, 1 insertion(+), 118 deletions(-) |
17 |
|
18 |
diff --git a/sys-cluster/veloc/Manifest b/sys-cluster/veloc/Manifest |
19 |
index cf92618f7..9e22f9f21 100644 |
20 |
--- a/sys-cluster/veloc/Manifest |
21 |
+++ b/sys-cluster/veloc/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST veloc-1.5.tar.gz 252563 BLAKE2B 03e5957990f449e7e3ac9a543ce1317c2347e965c455dcd29d0ed525c93d3e4134592cce73fa388af807c293e8ba7db3943dd039400b86878b7bc91b4956a76d SHA512 618d30b9e1e28882fdb3559bd65ed52b2541dcd1aeb04fcc2943ed96501fa3219c8a3dc32861f1c14454e6e42a6a04b1affd1472a770be9e7ae4525eb43cc755 |
24 |
DIST veloc-1.6.tar.gz 243253 BLAKE2B 38f2878481a5895d3b73bfb9ae6cb7a59b2231b465ca8c31c2bcfa02cef27f74fd09482a52a90ece8ae67f4a4555f696ac3391d48bd45c847df2c78c1f19eae1 SHA512 d09b748d5e85212a3abbbe1b3fc554b6a612a1fd1af2b384836af571112007e1b3354a243633cee9794f49124f539caec4f9a941e64ce5b3cc052a6e5b4cba95 |
25 |
|
26 |
diff --git a/sys-cluster/veloc/files/veloc-strip-cflags.patch b/sys-cluster/veloc/files/veloc-strip-cflags.patch |
27 |
deleted file mode 100644 |
28 |
index 413bb9b44..000000000 |
29 |
--- a/sys-cluster/veloc/files/veloc-strip-cflags.patch |
30 |
+++ /dev/null |
31 |
@@ -1,11 +0,0 @@ |
32 |
---- a/CMakeLists.txt |
33 |
-+++ b/CMakeLists.txt |
34 |
-@@ -4,7 +4,7 @@ |
35 |
- ##### Global settings |
36 |
- include(GNUInstallDirs) |
37 |
- list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") |
38 |
--add_definitions(-O2 -g -Wall -D__BENCHMARK -D__ASSERT -D__INFO) |
39 |
-+add_definitions( -Wall -D__BENCHMARK -D__ASSERT -D__INFO) |
40 |
- set(CMAKE_CXX_STANDARD 14) |
41 |
- |
42 |
- ##### Configuration setting |
43 |
|
44 |
diff --git a/sys-cluster/veloc/veloc-1.5-r1.ebuild b/sys-cluster/veloc/veloc-1.5-r1.ebuild |
45 |
deleted file mode 100644 |
46 |
index 54a497b73..000000000 |
47 |
--- a/sys-cluster/veloc/veloc-1.5-r1.ebuild |
48 |
+++ /dev/null |
49 |
@@ -1,105 +0,0 @@ |
50 |
-# Copyright 1999-2021 Gentoo Authors |
51 |
-# Distributed under the terms of the GNU General Public License v2 |
52 |
- |
53 |
-EAPI=8 |
54 |
- |
55 |
-DISTUTILS_USE_SETUPTOOLS=no |
56 |
-PYTHON_COMPAT=( python3_{8..10} ) |
57 |
- |
58 |
-inherit cmake distutils-r1 |
59 |
- |
60 |
-DESCRIPTION="Very-Low Overhead Checkpointing System" |
61 |
-HOMEPAGE="https://github.com/ECP-VeloC/VELOC" |
62 |
-SRC_URI="https://github.com/ECP-VeloC/VELOC/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" |
63 |
-S="${WORKDIR}/${PN^^}-${PV}" |
64 |
- |
65 |
-LICENSE="MIT" |
66 |
-SLOT="0" |
67 |
-KEYWORDS="~amd64" |
68 |
- |
69 |
-IUSE_COMM_QUEUE=" |
70 |
- +comm-queue-ipc |
71 |
- comm-queue-socket |
72 |
-" |
73 |
-# comm-queue-thallium |
74 |
-IUSE="${IUSE_COMM_QUEUE} python +slurm" |
75 |
- |
76 |
-RDEPEND=" |
77 |
- comm-queue-ipc? ( dev-libs/boost ) |
78 |
- slurm? ( sys-cluster/slurm ) |
79 |
- |
80 |
- app-shells/pdsh |
81 |
- dev-libs/openssl |
82 |
- <sys-cluster/AXL-0.4.0 |
83 |
- sys-cluster/er |
84 |
- virtual/mpi |
85 |
-" |
86 |
-# comm-queue-thallium? ( thallium ) |
87 |
-DEPEND="${RDEPEND}" |
88 |
- |
89 |
-PATCHES=( "${FILESDIR}/${PN}-strip-cflags.patch" ) |
90 |
-# Tests not working with python yet |
91 |
-#RESTRICT="python? ( test )" |
92 |
-REQUIRED_USE=" |
93 |
- ^^ ( ${IUSE_COMM_QUEUE/+/} ) |
94 |
-" |
95 |
- |
96 |
-distutils_enable_sphinx "${S}/docs" --no-autodoc |
97 |
-distutils_enable_tests pytest |
98 |
- |
99 |
-src_prepare() { |
100 |
- cmake_src_prepare |
101 |
-} |
102 |
- |
103 |
-src_configure() { |
104 |
- local resman="NONE" |
105 |
- use slurm && resman="SLURM" |
106 |
- |
107 |
- local queue |
108 |
- use comm-queue-ipc && queue="ipc_queue" |
109 |
- use comm-queue-socket && queue="socket_queue" |
110 |
-# use comm-queue-thallium && queue="thallium_queue" |
111 |
- |
112 |
- local mycmakeargs=( |
113 |
- -DCMAKE_INSTALL_LIBDIR="$(get_libdir)" |
114 |
- -DCOMM_QUEUE="${queue}" |
115 |
- -DVELOC_RESOURCE_MANAGER="${resman}" |
116 |
- -DX_LIBDIR="$(get_libdir)" |
117 |
- ) |
118 |
- cmake_src_configure |
119 |
-} |
120 |
- |
121 |
-src_compile() { |
122 |
- cmake_src_compile |
123 |
- if use python; then |
124 |
- pushd "src/bindings/python" || die |
125 |
- distutils-r1_src_compile |
126 |
- popd || die |
127 |
- else |
128 |
- # If USE="-python doc" we still |
129 |
- # want to compile the doc files |
130 |
- sphinx_compile_all |
131 |
- fi |
132 |
-} |
133 |
- |
134 |
-src_install() { |
135 |
- cmake_src_install |
136 |
- if use python; then |
137 |
- pushd "${S}/src/bindings/python" || die |
138 |
- distutils-r1_src_install |
139 |
- popd || die |
140 |
- fi |
141 |
-} |
142 |
- |
143 |
-src_test() { |
144 |
- cd test |
145 |
- default |
146 |
- if use python; then |
147 |
- pushd "${S}/src/bindings/python" || die |
148 |
-# python_test() { |
149 |
-# "${EPYTHON}" test.py -v || die |
150 |
-# } |
151 |
- distutils-r1_src_test |
152 |
- popd || die |
153 |
- fi |
154 |
-} |
155 |
|
156 |
diff --git a/sys-cluster/veloc/veloc-1.6.ebuild b/sys-cluster/veloc/veloc-1.6.ebuild |
157 |
index 3317e524e..9132559a1 100644 |
158 |
--- a/sys-cluster/veloc/veloc-1.6.ebuild |
159 |
+++ b/sys-cluster/veloc/veloc-1.6.ebuild |
160 |
@@ -30,7 +30,7 @@ RDEPEND=" |
161 |
slurm? ( sys-cluster/slurm ) |
162 |
|
163 |
dev-libs/openssl |
164 |
- <sys-cluster/AXL-0.4.0 |
165 |
+ ~sys-cluster/AXL-0.5.0 |
166 |
sys-cluster/er |
167 |
virtual/mpi |
168 |
" |