Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/clblas/, sci-libs/clblas/files/
Date: Tue, 29 Dec 2020 12:57:43
Message-Id: 1609246646.02156e32c4b284613180cde84812a06be830d2ae.soap@gentoo
1 commit: 02156e32c4b284613180cde84812a06be830d2ae
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 29 12:57:26 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 29 12:57:26 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02156e32
7
8 sci-libs/clblas: Remove old 2.10
9
10 Closes: https://bugs.gentoo.org/608086
11 Closes: https://bugs.gentoo.org/741386
12 Closes: https://bugs.gentoo.org/737410
13 Package-Manager: Portage-3.0.12, Repoman-3.0.2
14 Signed-off-by: David Seifert <soap <AT> gentoo.org>
15
16 sci-libs/clblas/Manifest | 1 -
17 sci-libs/clblas/clblas-2.10.ebuild | 102 ---------------------
18 .../clblas-2.10-disable-multilib-cflags.patch | 20 ----
19 .../files/clblas-2.10-fix-blas-dot-calls.patch | 59 ------------
20 .../files/clblas-2.10-fix-doxygen-output-dir.patch | 16 ----
21 .../files/clblas-2.10-fix-pthread-linkage.patch | 18 ----
22 .../files/clblas-2.10-use-boost-dynamic-libs.patch | 16 ----
23 .../files/clblas-2.10-use-system-mathjax.patch | 18 ----
24 8 files changed, 250 deletions(-)
25
26 diff --git a/sci-libs/clblas/Manifest b/sci-libs/clblas/Manifest
27 index d282335f29d..5ccea72193c 100644
28 --- a/sci-libs/clblas/Manifest
29 +++ b/sci-libs/clblas/Manifest
30 @@ -1,2 +1 @@
31 -DIST clblas-2.10.tar.gz 1154117 BLAKE2B 67035b03ab3a8fa07f32cb8d1d40af39fd885ceb21d9754f8a49a62adcfacbeeec703dfdae922ec0fc915a2dcadff2fc2f07a6c5ced74db3da6cd85c6c63f4d5 SHA512 5ed43104aae565292e0df4cc9e014cf483ccc0ff89257ebb5817f6508bfc9593585ed658da639f2167fbfb5d92ef116be4d5de3694f56e1a1e228bd42b1c05c6
32 DIST clblas-2.12.tar.gz 1157445 BLAKE2B 27352a7775db94808ce21f2b4a39fe505d4f37be4305dc7fb5a4068a86d3f51a9e4863931f634150762b31256f9f7e8e5d0d8b70f404b5a9ddb8a489b800aea6 SHA512 5d9b0c58adde69e83d95e9c713e0cdc5f64785fe7e05553a14c57fa483c4ef39e9dc780c26880a7f15924967d5ce4ea29035c29d63eac7ee5a2ae5ddacac2b72
33
34 diff --git a/sci-libs/clblas/clblas-2.10.ebuild b/sci-libs/clblas/clblas-2.10.ebuild
35 deleted file mode 100644
36 index 112150552dc..00000000000
37 --- a/sci-libs/clblas/clblas-2.10.ebuild
38 +++ /dev/null
39 @@ -1,102 +0,0 @@
40 -# Copyright 1999-2020 Gentoo Authors
41 -# Distributed under the terms of the GNU General Public License v2
42 -
43 -EAPI=6
44 -
45 -PYTHON_COMPAT=( python3_6 )
46 -FORTRAN_NEEDED=test
47 -
48 -inherit cmake-utils python-single-r1 toolchain-funcs fortran-2
49 -
50 -MYPN="clBLAS"
51 -
52 -DESCRIPTION="Library containing BLAS routines for OpenCL"
53 -HOMEPAGE="https://github.com/clMathLibraries/clBLAS"
54 -SRC_URI="https://github.com/clMathLibraries/${MYPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
55 -
56 -LICENSE="Apache-2.0"
57 -SLOT="0/2" # soname version
58 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
59 -IUSE="+client doc examples ktest performance test"
60 -RESTRICT="!test? ( test )"
61 -
62 -REQUIRED_USE="performance? ( ${PYTHON_REQUIRED_USE} )"
63 -
64 -RDEPEND="
65 - virtual/opencl
66 - doc? ( dev-libs/mathjax )
67 - performance? ( ${PYTHON_DEPS} )
68 -"
69 -DEPEND="${RDEPEND}
70 - doc? ( app-doc/doxygen )
71 - test? (
72 - dev-cpp/gtest
73 - dev-libs/boost
74 - virtual/pkgconfig
75 - virtual/blas
76 - )
77 -"
78 -
79 -S="${WORKDIR}/${MYPN}-${PV}"
80 -CMAKE_USE_DIR="${S}/src"
81 -
82 -PATCHES=(
83 - "${FILESDIR}"/${P}-disable-multilib-cflags.patch
84 - "${FILESDIR}"/${P}-fix-blas-dot-calls.patch
85 - "${FILESDIR}"/${P}-fix-doxygen-output-dir.patch
86 - "${FILESDIR}"/${P}-fix-pthread-linkage.patch
87 - "${FILESDIR}"/${P}-use-boost-dynamic-libs.patch
88 - "${FILESDIR}"/${P}-use-system-mathjax.patch
89 -)
90 -
91 -src_configure() {
92 - local mycmakeargs=(
93 - -DBUILD_SHARED_LIBS=ON
94 - -DBUILD_RUNTIME=ON
95 - -DBUILD_SAMPLE=OFF
96 - -DBUILD_CLIENT="$(usex client)"
97 - -DBUILD_KTEST="$(usex ktest)"
98 - -DBUILD_PERFORMANCE="$(usex performance)"
99 - )
100 - if use test; then
101 - mycmakeargs+=(
102 - -DBUILD_TEST=ON
103 - -DUSE_SYSTEM_GTEST=ON
104 - -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
105 - )
106 - else
107 - mycmakeargs+=( -DBUILD_TEST=OFF )
108 - fi
109 - cmake-utils_src_configure
110 -}
111 -
112 -src_compile() {
113 - cmake-utils_src_compile
114 - if use doc; then
115 - cd doc
116 - doxygen clBLAS.doxy || die
117 - fi
118 -}
119 -
120 -src_test() {
121 - pushd "${BUILD_DIR}/staging" > /dev/null
122 - LD_LIBRARY_PATH="${BUILD_DIR}/library:${LD_LIBRARY_PATH}" \
123 - ./test-short
124 - popd > /dev/null
125 -
126 - # horrible hack to avoid installing compiled tests
127 - # this will trigger some overcompilation
128 - mycmakeargs+=( -DBUILD_TEST=OFF )
129 - cmake-utils_src_configure
130 -}
131 -
132 -src_install() {
133 - use doc && HTML_DOCS=( doc/html/. )
134 - cmake-utils_src_install
135 - dodoc CHANGELOG CONTRIBUTING.md NOTICE README.md
136 - if use examples; then
137 - insinto /usr/share/doc/${PF}/examples
138 - doins -r src/samples/*
139 - docompress -x /usr/share/doc/${PF}/examples
140 - fi
141 -}
142
143 diff --git a/sci-libs/clblas/files/clblas-2.10-disable-multilib-cflags.patch b/sci-libs/clblas/files/clblas-2.10-disable-multilib-cflags.patch
144 deleted file mode 100644
145 index a7e59d913f0..00000000000
146 --- a/sci-libs/clblas/files/clblas-2.10-disable-multilib-cflags.patch
147 +++ /dev/null
148 @@ -1,20 +0,0 @@
149 -Description: disable multilib flags
150 -Author: Ghislain Antony Vaillant <ghisvail@×××××.com>
151 -Forwarded: not-needed
152 ----
153 -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
154 ---- a/src/CMakeLists.txt
155 -+++ b/src/CMakeLists.txt
156 -@@ -296,9 +296,9 @@
157 - # Don't use -rpath.
158 - set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE)
159 -
160 -- set(CMAKE_C_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_C_FLAGS}")
161 -- set(CMAKE_CXX_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_CXX_FLAGS}")
162 -- set(CMAKE_Fortran_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_Fortran_FLAGS}")
163 -+ #set(CMAKE_C_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_C_FLAGS}")
164 -+ #set(CMAKE_CXX_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_CXX_FLAGS}")
165 -+ #set(CMAKE_Fortran_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_Fortran_FLAGS}")
166 -
167 - if(TARGET_PLATFORM EQUAL 32)
168 - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-builtin")
169
170 diff --git a/sci-libs/clblas/files/clblas-2.10-fix-blas-dot-calls.patch b/sci-libs/clblas/files/clblas-2.10-fix-blas-dot-calls.patch
171 deleted file mode 100644
172 index cc2c6c3c176..00000000000
173 --- a/sci-libs/clblas/files/clblas-2.10-fix-blas-dot-calls.patch
174 +++ /dev/null
175 @@ -1,59 +0,0 @@
176 -diff --git a/src/tests/correctness/blas-lapack.c b/src/tests/correctness/blas-lapack.c
177 -index 9687bdf..54666b1 100644
178 ---- a/src/tests/correctness/blas-lapack.c
179 -+++ b/src/tests/correctness/blas-lapack.c
180 -@@ -655,7 +655,7 @@ complex cdotu( int n, complex *x, int incx, complex *y, int incy)
181 - #elif defined( __APPLE__)
182 - cblas_cdotu_sub(n, x, incx, y, incy, &ans);
183 - #else
184 -- cdotusub_(&n, x, &incx, y, &incy, &ans);
185 -+ ans = cdotu_(&n, x, &incx, y, &incy);
186 - #endif
187 -
188 - return ans;
189 -@@ -670,7 +670,7 @@ doublecomplex zdotu( int n, doublecomplex *x, int incx, doublecomplex *y, int i
190 - #elif defined(__APPLE__)
191 - cblas_zdotu_sub(n, x, incx, y, incy, &ans);
192 - #else
193 -- zdotusub_(&n, x, &incx, y, &incy, &ans);
194 -+ ans = zdotu_(&n, x, &incx, y, &incy);
195 - #endif
196 -
197 - return ans;
198 -@@ -685,7 +685,7 @@ complex cdotc( int n, complex *x, int incx, complex *y, int incy)
199 - #elif defined(__APPLE__)
200 - cblas_cdotc_sub(n, x, incx, y, incy, &ans);
201 - #else
202 -- cdotcsub_(&n, x, &incx, y, &incy, &ans);
203 -+ ans = cdotc_(&n, x, &incx, y, &incy);
204 - #endif
205 -
206 - return ans;
207 -@@ -700,7 +700,7 @@ doublecomplex zdotc( int n, doublecomplex *x, int incx, doublecomplex *y, int i
208 - #elif defined(__APPLE__)
209 - cblas_zdotc_sub(n, x, incx, y, incy, &ans);
210 - #else
211 -- zdotcsub_(&n, x, &incx, y, &incy, &ans);
212 -+ ans = zdotc_(&n, x, &incx, y, &incy);
213 - #endif
214 -
215 - return ans;
216 -diff --git a/src/tests/correctness/blas-lapack.h b/src/tests/correctness/blas-lapack.h
217 -index d2db1aa..8619e1e 100644
218 ---- a/src/tests/correctness/blas-lapack.h
219 -+++ b/src/tests/correctness/blas-lapack.h
220 -@@ -1170,10 +1170,10 @@ double ddot_(int *n, double *x, int *incx, double* y, int *incy);
221 - complex cdotc_(int *n, complex *x, int *incx, complex* y, int *incy);
222 - doublecomplex zdotc_(int *n, doublecomplex *x, int *incx, doublecomplex* y, int *incy);
223 - #else
224 -- void cdotusub_(int *n, complex *x, int *incx, complex* y, int *incy, complex *ans);
225 -- void zdotusub_(int *n, doublecomplex *x, int *incx, doublecomplex* y, int *incy, doublecomplex *ans);
226 -- void cdotcsub_(int *n, complex *x, int *incx, complex* y, int *incy, complex *ans);
227 -- void zdotcsub_(int *n, doublecomplex *x, int *incx, doublecomplex* y, int *incy, doublecomplex *ans);
228 -+ complex cdotu_(int *n, complex *x, int *incx, complex* y, int *incy);
229 -+ doublecomplex zdotu_(int *n, doublecomplex *x, int *incx, doublecomplex* y, int *incy);
230 -+ complex cdotc_(int *n, complex *x, int *incx, complex* y, int *incy);
231 -+ doublecomplex zdotc_(int *n, doublecomplex *x, int *incx, doublecomplex* y, int *incy);
232 - #endif
233 -
234 - void sswap_(int *n, float *x, int *incx, float* y, int *incy);
235
236 diff --git a/sci-libs/clblas/files/clblas-2.10-fix-doxygen-output-dir.patch b/sci-libs/clblas/files/clblas-2.10-fix-doxygen-output-dir.patch
237 deleted file mode 100644
238 index 31abb89b1c3..00000000000
239 --- a/sci-libs/clblas/files/clblas-2.10-fix-doxygen-output-dir.patch
240 +++ /dev/null
241 @@ -1,16 +0,0 @@
242 -Description: use system mathjax instead of remote
243 -Author: Ghislain Antony Vaillant <ghisvail@×××××.com>
244 -Forwarded: not-needed
245 ----
246 -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
247 ---- a/doc/clBLAS.doxy
248 -+++ b/doc/clBLAS.doxy
249 -@@ -52,7 +52,7 @@
250 - # If a relative path is entered, it will be relative to the location
251 - # where doxygen was started. If left blank the current directory will be used.
252 -
253 --OUTPUT_DIRECTORY = ..\..\bin\clBLAS.doxy
254 -+OUTPUT_DIRECTORY =
255 -
256 - # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
257 - # 4096 sub-directories (in 2 levels) under the output directory of each output
258
259 diff --git a/sci-libs/clblas/files/clblas-2.10-fix-pthread-linkage.patch b/sci-libs/clblas/files/clblas-2.10-fix-pthread-linkage.patch
260 deleted file mode 100644
261 index aa99529df03..00000000000
262 --- a/sci-libs/clblas/files/clblas-2.10-fix-pthread-linkage.patch
263 +++ /dev/null
264 @@ -1,18 +0,0 @@
265 -Description: fix missing linkage with pthread
266 -Author: Ghislain Antony Vaillant <ghisvail@×××××.com>
267 -Forwarded: no
268 ----
269 -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
270 ---- a/src/library/CMakeLists.txt
271 -+++ b/src/library/CMakeLists.txt
272 -@@ -888,6 +888,10 @@
273 - set_target_properties( clBLAS PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
274 - target_link_libraries(clBLAS ${OPENCL_LIBRARIES} ${MATH_LIBRARY})
275 -
276 -+set(THREADS_PREFER_PTHREAD_FLAG ON)
277 -+find_package(Threads REQUIRED)
278 -+target_link_libraries(clBLAS ${CMAKE_THREAD_LIBS_INIT})
279 -+
280 - # CPack configuration; include the executable into the package
281 - install( TARGETS clBLAS
282 - EXPORT Library
283
284 diff --git a/sci-libs/clblas/files/clblas-2.10-use-boost-dynamic-libs.patch b/sci-libs/clblas/files/clblas-2.10-use-boost-dynamic-libs.patch
285 deleted file mode 100644
286 index 57c585da11f..00000000000
287 --- a/sci-libs/clblas/files/clblas-2.10-use-boost-dynamic-libs.patch
288 +++ /dev/null
289 @@ -1,16 +0,0 @@
290 -Description: use Boost shared libraries instead of static
291 -Author: Ghislain Antony Vaillant <ghisvail@×××××.com>
292 -Forwarded: no
293 ----
294 -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
295 ---- a/src/CMakeLists.txt
296 -+++ b/src/CMakeLists.txt
297 -@@ -270,7 +270,7 @@
298 -
299 - # Find Boost on the system, and configure the type of boost build we want
300 - set( Boost_USE_MULTITHREADED ON )
301 --set( Boost_USE_STATIC_LIBS ON )
302 -+set( Boost_USE_STATIC_LIBS OFF )
303 - set( Boost_DETAILED_FAILURE_MSG ON )
304 - set( Boost_DEBUG ON )
305 - set( Boost_ADDITIONAL_VERSIONS "1.44.0" "1.44" "1.47.0" "1.47" )
306
307 diff --git a/sci-libs/clblas/files/clblas-2.10-use-system-mathjax.patch b/sci-libs/clblas/files/clblas-2.10-use-system-mathjax.patch
308 deleted file mode 100644
309 index 775a669e96a..00000000000
310 --- a/sci-libs/clblas/files/clblas-2.10-use-system-mathjax.patch
311 +++ /dev/null
312 @@ -1,18 +0,0 @@
313 -Description: fix output directory for documentation
314 - Use default doxygen directory, i.e. under docs/html, rather than the
315 - inappropriate path set by upstream.
316 -Author: Ghislain Antony Vaillant <ghisvail@×××××.com>
317 -Forwarded: no
318 ----
319 -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
320 ---- a/doc/clBLAS.doxy
321 -+++ b/doc/clBLAS.doxy
322 -@@ -1223,7 +1223,7 @@
323 - # installing MathJax. However, it is strongly recommended to install a local
324 - # copy of MathJax from http://www.mathjax.org before deployment.
325 -
326 --MATHJAX_RELPATH = http://www.mathjax.org/mathjax
327 -+MATHJAX_RELPATH = /usr/share/javascript/mathjax
328 -
329 - # The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
330 - # names that should be enabled during MathJax rendering.
Report Message
Find on MARC Find on Google Groups