Gentoo Archives: gentoo-commits

From: Alessandro Barbieri <lssndrbarbieri@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-cpp/vexcl/
Date: Sun, 22 Aug 2021 02:01:03
Message-Id: 1629595058.8fe125e027df6d4a43b2e38c83e52c4fcb71060e.Alessandro-Barbieri@gentoo
1 commit: 8fe125e027df6d4a43b2e38c83e52c4fcb71060e
2 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
3 AuthorDate: Sun Aug 22 01:07:59 2021 +0000
4 Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
5 CommitDate: Sun Aug 22 01:17:38 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8fe125e0
7
8 dev-cpp/vexcl: always depend on boost, add IUSE_BACKEND
9
10 Closes: https://bugs.gentoo.org/799839
11 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
12
13 dev-cpp/vexcl/metadata.xml | 8 ++++----
14 dev-cpp/vexcl/vexcl-1.4.2-r1.ebuild | 29 +++++++++++++++++++----------
15 2 files changed, 23 insertions(+), 14 deletions(-)
16
17 diff --git a/dev-cpp/vexcl/metadata.xml b/dev-cpp/vexcl/metadata.xml
18 index 419b97cb5..eba4a282b 100644
19 --- a/dev-cpp/vexcl/metadata.xml
20 +++ b/dev-cpp/vexcl/metadata.xml
21 @@ -18,9 +18,9 @@
22 <flag name="amdsi">Implement workaround for AMD SI GPUs</flag>
23 <flag name="clhpp">Install the OpenCL C++ header provided by VexCL</flag>
24 <!--<flag name="clogs">Use clogs algorithms</flag>-->
25 - <flag name="compute">Use Boost.Compute algorithms</flag>
26 - <!--<flag name="cuda">Use CUDA as backend</flag>-->
27 - <flag name="jit">Use the JIT backend</flag>
28 - <flag name="opencl">Use OpenCL as backend</flag>
29 + <flag name="backend-compute">Use Boost.Compute algorithms</flag>
30 + <!--<flag name="backend-cuda">Use CUDA as backend</flag>-->
31 + <flag name="backend-jit">Use the JIT backend</flag>
32 + <flag name="backend-opencl">Use OpenCL as backend</flag>
33 </use>
34 </pkgmetadata>
35
36 diff --git a/dev-cpp/vexcl/vexcl-1.4.2-r1.ebuild b/dev-cpp/vexcl/vexcl-1.4.2-r1.ebuild
37 index b3c196c69..d5eac888d 100644
38 --- a/dev-cpp/vexcl/vexcl-1.4.2-r1.ebuild
39 +++ b/dev-cpp/vexcl/vexcl-1.4.2-r1.ebuild
40 @@ -20,18 +20,27 @@ SRC_URI="https://github.com/ddemidov/vexcl/archive/refs/tags/${PV}.tar.gz -> ${P
41 LICENSE="MIT"
42 SLOT="0"
43 KEYWORDS="~amd64"
44 -IUSE="amdsi clhpp compute examples jit +opencl test" #cuda clogs
45 -REQUIRED_USE="^^ ( compute jit opencl )" #cuda
46 -RESTRICT="!test? ( test )"
47 +IUSE_BACKEND="
48 + backend-compute
49 + backend-jit
50 + +backend-opencl
51 +"
52 +# backend-cuda
53 +IUSE_EXPAND="BACKEND"
54 +IUSE="${IUSE_BACKEND} amdsi clhpp examples test" #clogs
55
56 RDEPEND="
57 - compute? ( dev-libs/boost:= )
58 - jit? ( virtual/opencl )
59 - opencl? ( virtual/opencl )
60 + dev-libs/boost:=
61 + backend-jit? ( virtual/opencl )
62 + backend-opencl? ( virtual/opencl )
63 "
64 DEPEND="${RDEPEND}"
65
66 PATCHES=( "${FILESDIR}/add-sphinx-ext-autodoc-to-conf-py.patch" )
67 +REQUIRED_USE="
68 + ^^ ( ${IUSE_BACKEND//+/} )
69 +"
70 +RESTRICT="!test? ( test )"
71
72 src_prepare() {
73 sed -e "s|git_version()|\'${PV}\'|g" -i docs/conf.py || die
74 @@ -41,10 +50,10 @@ src_prepare() {
75 src_configure() {
76 local backend
77 # use && backend="All"
78 - use compute && backend="Compute"
79 -# use cuda && backend="CUDA"
80 - use jit && backend="JIT"
81 - use opencl && backend="OpenCL"
82 + use backend-compute && backend="Compute"
83 +# use backend-cuda && backend="CUDA"
84 + use backend-jit && backend="JIT"
85 + use backend-opencl && backend="OpenCL"
86
87 local mycmakeargs=(
88 -DVEXCL_BUILD_EXAMPLES=OFF