1 |
commit: bec4046614eb8c67c71d0c804f4d8bbc34978a38 |
2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
3 |
AuthorDate: Mon Jun 14 10:17:03 2021 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 14 10:17:03 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bec40466 |
7 |
|
8 |
sci-libs/fftw: Remove :2.1 slot |
9 |
|
10 |
Closes: https://bugs.gentoo.org/772815 |
11 |
Closes: https://bugs.gentoo.org/775770 |
12 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
14 |
|
15 |
profiles/package.mask | 5 - |
16 |
sci-libs/fftw/Manifest | 1 - |
17 |
sci-libs/fftw/fftw-2.1.5-r9.ebuild | 137 ------------- |
18 |
sci-libs/fftw/files/fftw-2.1.5-as-needed.patch | 112 ---------- |
19 |
sci-libs/fftw/files/fftw-2.1.5-cc.patch | 19 -- |
20 |
sci-libs/fftw/files/fftw-2.1.5-configure.in.patch | 226 --------------------- |
21 |
sci-libs/fftw/files/fftw-2.1.5-no-test.patch | 33 --- |
22 |
.../fftw/files/fftw-2.1.5-parallel-tests.patch | 105 ---------- |
23 |
sci-libs/fftw/files/fftw-2.1.5-texinfo5.1.patch | 21 -- |
24 |
sci-libs/fftw/metadata.xml | 2 - |
25 |
10 files changed, 661 deletions(-) |
26 |
|
27 |
diff --git a/profiles/package.mask b/profiles/package.mask |
28 |
index d7078252928..5db15c5d300 100644 |
29 |
--- a/profiles/package.mask |
30 |
+++ b/profiles/package.mask |
31 |
@@ -352,11 +352,6 @@ dev-python/sphinxcontrib-httpexample |
32 |
# Pending PR: https://github.com/gentoo/gentoo/pull/20763 |
33 |
app-misc/gcstar |
34 |
|
35 |
-# David Seifert <soap@g.o> (2021-05-09) |
36 |
-# All revdeps masked, last release in 1999, needs to do now. |
37 |
-# Bug #772815, removal in 30 days. |
38 |
-sci-libs/fftw:2.1 |
39 |
- |
40 |
# Sam James <sam@g.o> (2021-05-09) |
41 |
# Not working properly with cmake.eclass port |
42 |
# bug #788448 |
43 |
|
44 |
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest |
45 |
index 3db9f31dca7..a4327766903 100644 |
46 |
--- a/sci-libs/fftw/Manifest |
47 |
+++ b/sci-libs/fftw/Manifest |
48 |
@@ -1,2 +1 @@ |
49 |
-DIST fftw-2.1.5.tar.gz 1256888 BLAKE2B 61e2eed91459479ab893a423c1a6f38dd7e9637e0466fa0a59fccfa2cec930e8870a5febfccfacfe44e876e40534c34e05dc62b8e7bf188b43fe3a65c6a7bdba SHA512 8724a7f66aa19b271aa0ffb0e3762919f08082ac4400f52d11b50aef9b9d23a7d4fc5d6b2eae0ac166e2bb30a4d38a52c878e8bf8e24aba01ab1c3ddf5ebec15 |
50 |
DIST fftw-3.3.9.tar.gz 4146999 BLAKE2B 6ea6966f3c5056102e6c3e4628b072c7e9832e3250b292808ed934b3a82515fd77658cbaff50d7b1268fb8c9444b10e39b22d100b7c31ea2452f3cee59c9f280 SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf |
51 |
|
52 |
diff --git a/sci-libs/fftw/fftw-2.1.5-r9.ebuild b/sci-libs/fftw/fftw-2.1.5-r9.ebuild |
53 |
deleted file mode 100644 |
54 |
index 0d4eae2fdb7..00000000000 |
55 |
--- a/sci-libs/fftw/fftw-2.1.5-r9.ebuild |
56 |
+++ /dev/null |
57 |
@@ -1,137 +0,0 @@ |
58 |
-# Copyright 1999-2021 Gentoo Authors |
59 |
-# Distributed under the terms of the GNU General Public License v2 |
60 |
- |
61 |
-EAPI=6 |
62 |
- |
63 |
-FORTRAN_NEEDED=fortran |
64 |
- |
65 |
-inherit autotools flag-o-matic fortran-2 multibuild toolchain-funcs |
66 |
- |
67 |
-DESCRIPTION="Fast C library for the Discrete Fourier Transform" |
68 |
-HOMEPAGE="http://www.fftw.org" |
69 |
-SRC_URI="http://www.fftw.org/${P}.tar.gz" |
70 |
- |
71 |
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" |
72 |
- |
73 |
-LICENSE="GPL-2+" |
74 |
-SLOT="2.1" |
75 |
-IUSE="doc float fortran mpi openmp threads static-libs" |
76 |
- |
77 |
-RDEPEND="mpi? ( virtual/mpi )" |
78 |
-DEPEND="${RDEPEND}" |
79 |
- |
80 |
-PATCHES=( |
81 |
- "${FILESDIR}"/${P}-as-needed.patch |
82 |
- "${FILESDIR}"/${P}-configure.in.patch |
83 |
- "${FILESDIR}"/${P}-no-test.patch |
84 |
- "${FILESDIR}"/${P}-cc.patch |
85 |
- "${FILESDIR}"/${P}-texinfo5.1.patch |
86 |
- "${FILESDIR}"/${P}-parallel-tests.patch |
87 |
-) |
88 |
- |
89 |
-pkg_pretend() { |
90 |
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
91 |
-} |
92 |
- |
93 |
-pkg_setup() { |
94 |
- if [[ ${MERGE_TYPE} != binary ]] && use openmp; then |
95 |
- tc-check-openmp |
96 |
- FORTRAN_NEED_OPENMP=1 |
97 |
- fi |
98 |
- |
99 |
- fortran-2_pkg_setup |
100 |
- |
101 |
- MULTIBUILD_VARIANTS=( single double ) |
102 |
-} |
103 |
- |
104 |
-src_prepare() { |
105 |
- default |
106 |
- |
107 |
- # fix info files |
108 |
- local infofile |
109 |
- for infofile in doc/fftw*info*; do |
110 |
- cat >> ${infofile} <<-EOF || die |
111 |
- INFO-DIR-SECTION Libraries |
112 |
- START-INFO-DIR-ENTRY |
113 |
- * fftw: (fftw). ${DESCRIPTION} |
114 |
- END-INFO-DIR-ENTRY |
115 |
- EOF |
116 |
- done |
117 |
- |
118 |
- mv configure.{in,ac} || die |
119 |
- sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die |
120 |
- |
121 |
- eautoreconf |
122 |
- |
123 |
- # 'FAQ' is actually a dir and causes issues with einstalldocs |
124 |
- rm -r FAQ || die |
125 |
- |
126 |
- multibuild_copy_sources |
127 |
-} |
128 |
- |
129 |
-fftw_src_configure() { |
130 |
- local myconf=( |
131 |
- --with-gcc=$(tc-getCC) |
132 |
- --enable-shared |
133 |
- --enable-type-prefix |
134 |
- --enable-vec-recurse |
135 |
- $(use_enable fortran) |
136 |
- $(use_enable mpi) |
137 |
- $(use_enable static-libs static) |
138 |
- $(use_enable x86 i386-hacks) |
139 |
- $(use_with openmp) |
140 |
- ) |
141 |
- |
142 |
- if use openmp || use threads; then |
143 |
- myconf+=( --enable-threads ) |
144 |
- else |
145 |
- myconf+=( --disable-threads ) |
146 |
- fi |
147 |
- |
148 |
- [[ $MULTIBUILD_VARIANT == single ]] && myconf+=( --enable-float ) |
149 |
- |
150 |
- econf "${myconf[@]}" |
151 |
-} |
152 |
- |
153 |
-src_configure() { |
154 |
- # this one is reported to cause trouble on pentium4 m series |
155 |
- filter-mfpmath sse |
156 |
- |
157 |
- # here I need (surprise) to increase optimization: |
158 |
- # --enable-i386-hacks requires -fomit-frame-pointer to work properly |
159 |
- if use x86; then |
160 |
- is-flag -fomit-frame-pointer || append-flags -fomit-frame-pointer |
161 |
- fi |
162 |
- use openmp && [[ $(tc-getCC)$ == icc* ]] && append-ldflags $(no-as-needed) |
163 |
- |
164 |
- multibuild_foreach_variant run_in_build_dir fftw_src_configure |
165 |
-} |
166 |
- |
167 |
-src_compile() { |
168 |
- multibuild_foreach_variant run_in_build_dir default_src_compile |
169 |
-} |
170 |
- |
171 |
-src_test() { |
172 |
- multibuild_foreach_variant run_in_build_dir default_src_test |
173 |
-} |
174 |
- |
175 |
-src_install() { |
176 |
- use doc && HTML_DOCS=( doc/*.{html,gif} ) |
177 |
- multibuild_foreach_variant run_in_build_dir default_src_install |
178 |
- |
179 |
- doheader fortran/fftw_f77.i |
180 |
- |
181 |
- create_fftw_symlinks() { |
182 |
- local i f letter=$1 |
183 |
- for i in fft rfft; do |
184 |
- for f in "${ED%/}"/usr/{include,$(get_libdir)}/*${letter}${i}*; do |
185 |
- ln -s $(basename ${f}) ${f/${letter}${i}/${i}} || die |
186 |
- done |
187 |
- done |
188 |
- } |
189 |
- create_fftw_symlinks $(usex float s d) |
190 |
- |
191 |
- if ! use static-libs; then |
192 |
- find "${D}" -name '*.la' -delete || die |
193 |
- fi |
194 |
-} |
195 |
|
196 |
diff --git a/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch b/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch |
197 |
deleted file mode 100644 |
198 |
index 63f46dccc4f..00000000000 |
199 |
--- a/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch |
200 |
+++ /dev/null |
201 |
@@ -1,112 +0,0 @@ |
202 |
---- a/rfftw/Makefile.am |
203 |
-+++ b/rfftw/Makefile.am |
204 |
-@@ -18,6 +18,7 @@ |
205 |
- rfftw.h |
206 |
- |
207 |
- lib@FFTW_PREFIX@rfftw_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ |
208 |
-+lib@FFTW_PREFIX@rfftw_la_LIBADD = ../fftw/lib@FFTW_PREFIX@××××.la |
209 |
- MAINTAINERCLEANFILES = $(CODELETS) rconfig.c |
210 |
- DISTCLEANFILES = srfftw.h drfftw.h |
211 |
- |
212 |
---- a/threads/Makefile.am |
213 |
-+++ b/threads/Makefile.am |
214 |
-@@ -28,6 +28,10 @@ |
215 |
- -version-info @SHARED_VERSION_INFO@ \ |
216 |
- -rpath $(libdir) |
217 |
- |
218 |
-+lib@FFTW_PREFIX@fftw_threads_la_LIBADD = \ |
219 |
-+ $(FFTWDIR)/lib@FFTW_PREFIX@××××.la \ |
220 |
-+ @THREADLIBS@ |
221 |
-+ |
222 |
- @FFTW_PREFIX1@fftw_threads.h: fftw_threads.h |
223 |
- rm -f $@ |
224 |
- sed 's/\"fftw/\"@FFTW_PREFIX@fftw/g;s/\"rfftw/\"@FFTW_PREFIX@rfftw/g' $(srcdir)/fftw_threads.h > $@ |
225 |
-@@ -49,6 +53,11 @@ |
226 |
- -version-info @SHARED_VERSION_INFO@ \ |
227 |
- -rpath $(libdir) |
228 |
- |
229 |
-+lib@FFTW_PREFIX@rfftw_threads_la_LIBADD = \ |
230 |
-+ $(RFFTWDIR)/lib@FFTW_PREFIX@×××××.la \ |
231 |
-+ $(FFTWDIR)/lib@FFTW_PREFIX@××××.la \ |
232 |
-+ @THREADLIBS@ |
233 |
-+ |
234 |
- @FFTW_PREFIX1@rfftw_threads.h: rfftw_threads.h |
235 |
- rm -f $@ |
236 |
- sed 's/\"fftw/\"@FFTW_PREFIX@fftw/g;s/\"rfftw/\"@FFTW_PREFIX@rfftw/g' $(srcdir)/rfftw_threads.h > $@ |
237 |
---- a/mpi/Makefile.am |
238 |
-+++ b/mpi/Makefile.am |
239 |
-@@ -28,6 +28,9 @@ |
240 |
- -version-info @SHARED_VERSION_INFO@ \ |
241 |
- -rpath $(libdir) |
242 |
- |
243 |
-+lib@FFTW_PREFIX@fftw_mpi_la_LIBADD = \ |
244 |
-+ @MPILIBS@ $(FFTWDIR)/lib@FFTW_PREFIX@××××.la |
245 |
-+ |
246 |
- @FFTW_PREFIX1@fftw_mpi.h: fftw_mpi.h |
247 |
- rm -f $@ |
248 |
- sed 's/\"fftw/\"@FFTW_PREFIX@fftw/g;s/\"rfftw/\"@FFTW_PREFIX@rfftw/g' $(srcdir)/fftw_mpi.h > $@ |
249 |
-@@ -39,32 +42,38 @@ |
250 |
- -version-info @SHARED_VERSION_INFO@ \ |
251 |
- -rpath $(libdir) |
252 |
- |
253 |
--@FFTW_PREFIX1@rfftw_mpi.h: rfftw_mpi.h |
254 |
-+lib@FFTW_PREFIX@rfftw_mpi_la_LIBADD = \ |
255 |
-+ @MPILIBS@ \ |
256 |
-+ $(RFFTWDIR)/lib@FFTW_PREFIX@×××××.la \ |
257 |
-+ $(FFTWDIR)/lib@FFTW_PREFIX@××××.la |
258 |
-+ |
259 |
-+@FFTW_PREFIX1@rfftw_mpi.h: rfftw_mpi.h |
260 |
- rm -f $@ |
261 |
- sed 's/\"fftw/\"@FFTW_PREFIX@fftw/g;s/\"rfftw/\"@FFTW_PREFIX@rfftw/g' $(srcdir)/rfftw_mpi.h > $@ |
262 |
- |
263 |
- CLEANFILES = @FFTW_PREFIX1@fftw_mpi.h @FFTW_PREFIX1@rfftw_mpi.h |
264 |
- |
265 |
- test_sched_SOURCES = test_sched.c |
266 |
--test_sched_LDADD = lib@FFTW_PREFIX@fftw_mpi.la \ |
267 |
-- $(FFTWDIR)/lib@FFTW_PREFIX@××××.la @MPILIBS@ |
268 |
-+test_sched_LDADD = @MPILIBS@ lib@FFTW_PREFIX@fftw_mpi.la \ |
269 |
-+ $(FFTWDIR)/lib@FFTW_PREFIX@××××.la |
270 |
- |
271 |
- test_transpose_mpi_SOURCES = test_transpose_mpi.c |
272 |
--test_transpose_mpi_LDADD = lib@FFTW_PREFIX@fftw_mpi.la \ |
273 |
-- $(FFTWDIR)/lib@FFTW_PREFIX@××××.la @MPILIBS@ |
274 |
-+test_transpose_mpi_LDADD = @MPILIBS@ lib@FFTW_PREFIX@fftw_mpi.la \ |
275 |
-+ $(FFTWDIR)/lib@FFTW_PREFIX@××××.la |
276 |
- |
277 |
- fftw_mpi_test_SOURCES = fftw_mpi_test.c |
278 |
- fftw_mpi_test_LDADD = ../tests/test_main.o \ |
279 |
-+ @MPILIBS@ \ |
280 |
- lib@FFTW_PREFIX@fftw_mpi.la \ |
281 |
-- $(FFTWDIR)/lib@FFTW_PREFIX@××××.la @MPILIBS@ |
282 |
-+ $(FFTWDIR)/lib@FFTW_PREFIX@××××.la |
283 |
- |
284 |
- rfftw_mpi_test_SOURCES = rfftw_mpi_test.c |
285 |
- rfftw_mpi_test_LDADD = ../tests/test_main.o \ |
286 |
-+ @MPILIBS@ \ |
287 |
- lib@FFTW_PREFIX@rfftw_mpi.la \ |
288 |
- lib@FFTW_PREFIX@fftw_mpi.la \ |
289 |
- $(RFFTWDIR)/lib@FFTW_PREFIX@×××××.la \ |
290 |
-- $(FFTWDIR)/lib@FFTW_PREFIX@××××.la \ |
291 |
-- @MPILIBS@ |
292 |
-+ $(FFTWDIR)/lib@FFTW_PREFIX@××××.la |
293 |
- |
294 |
- # for some reason, automake tries to use autoheader in order to |
295 |
- # generate config.h.in, and fails because config.h.in is GNU-lly |
296 |
---- a/mpi/test_sched.c |
297 |
-+++ b/mpi/test_sched.c |
298 |
-@@ -27,6 +27,8 @@ |
299 |
- int **sched; |
300 |
- int npes = -1, sortpe = -1, steps; |
301 |
- |
302 |
-+ /* needed to link with proper mpi libs */ |
303 |
-+ MPI_Init(&argc,&argv); |
304 |
- if (argc >= 2) { |
305 |
- npes = atoi(argv[1]); |
306 |
- if (npes <= 0) { |
307 |
-@@ -121,5 +123,6 @@ |
308 |
- } |
309 |
- } |
310 |
- |
311 |
-+ MPI_Finalize(); |
312 |
- return 0; |
313 |
- } |
314 |
|
315 |
diff --git a/sci-libs/fftw/files/fftw-2.1.5-cc.patch b/sci-libs/fftw/files/fftw-2.1.5-cc.patch |
316 |
deleted file mode 100644 |
317 |
index aa5c6db038c..00000000000 |
318 |
--- a/sci-libs/fftw/files/fftw-2.1.5-cc.patch |
319 |
+++ /dev/null |
320 |
@@ -1,19 +0,0 @@ |
321 |
---- a/configure.in |
322 |
-+++ b/configure.in |
323 |
-@@ -25,6 +25,8 @@ |
324 |
- AC_ARG_WITH(gcc, [ --with-gcc use gcc instead of the native compiler cc], ok=$withval, ok=no) |
325 |
- if test "$ok" = "yes"; then |
326 |
- CC=gcc |
327 |
-+else |
328 |
-+ CC=$withval |
329 |
- fi |
330 |
- |
331 |
- AC_ARG_ENABLE(float, [ --enable-float compile fftw for single precision], enable_float=$enableval, enable_float=no) |
332 |
-@@ -96,6 +96,7 @@ |
333 |
- AM_PROG_LIBTOOL |
334 |
- AC_CHECK_PROG(PERL, perl, perl, echo perl) |
335 |
- AC_SUBST(PERL) |
336 |
-+AC_SUBST(CC) |
337 |
- |
338 |
- dnl ----------------------------------------------------------------------- |
339 |
- |
340 |
|
341 |
diff --git a/sci-libs/fftw/files/fftw-2.1.5-configure.in.patch b/sci-libs/fftw/files/fftw-2.1.5-configure.in.patch |
342 |
deleted file mode 100644 |
343 |
index 7abe3e751d5..00000000000 |
344 |
--- a/sci-libs/fftw/files/fftw-2.1.5-configure.in.patch |
345 |
+++ /dev/null |
346 |
@@ -1,226 +0,0 @@ |
347 |
---- a/configure.in |
348 |
-+++ b/configure.in |
349 |
-@@ -1,6 +1,8 @@ |
350 |
-+ |
351 |
- dnl Process this file with autoconf to produce a configure script. |
352 |
- AC_INIT(fftw/planner.c) |
353 |
- AM_INIT_AUTOMAKE(fftw, 2.1.5) |
354 |
-+AM_MAINTAINER_MODE |
355 |
- |
356 |
- dnl This is the version info according to the libtool versioning system. |
357 |
- dnl It does *not* correspond to the release number. |
358 |
-@@ -27,7 +29,7 @@ |
359 |
- |
360 |
- AC_ARG_ENABLE(float, [ --enable-float compile fftw for single precision], enable_float=$enableval, enable_float=no) |
361 |
- if test "$enable_float" = "yes"; then |
362 |
-- AC_DEFINE(FFTW_ENABLE_FLOAT) |
363 |
-+ AC_DEFINE(FFTW_ENABLE_FLOAT,1,[Compile fftw for single precision]) |
364 |
- fi |
365 |
- |
366 |
- FFTW_PREFIX="" |
367 |
-@@ -56,27 +58,27 @@ |
368 |
- |
369 |
- AC_ARG_ENABLE(i386-hacks, [ --enable-i386-hacks enable gcc/x86 specific performance hacks], ok=$enableval, ok=no) |
370 |
- if test "$ok" = "yes"; then |
371 |
-- AC_DEFINE(FFTW_ENABLE_I386_HACKS) |
372 |
-+ AC_DEFINE(FFTW_ENABLE_I386_HACKS,1,[Enable x86 specific performance hacks]) |
373 |
- fi |
374 |
- |
375 |
- AC_ARG_ENABLE(pentium-timer, [ --enable-pentium-timer enable high resolution Pentium timer], ok=$enableval, ok=no) |
376 |
- if test "$ok" = "yes"; then |
377 |
-- AC_DEFINE(FFTW_ENABLE_PENTIUM_TIMER) |
378 |
-+ AC_DEFINE(FFTW_ENABLE_PENTIUM_TIMER,1,[Enable high resolution Pentium timer]) |
379 |
- fi |
380 |
- |
381 |
- AC_ARG_ENABLE(debug, [ --enable-debug compile fftw with extra runtime checks for debugging], ok=$enableval, ok=no) |
382 |
- if test "$ok" = "yes"; then |
383 |
-- AC_DEFINE(FFTW_DEBUG) |
384 |
-+ AC_DEFINE(FFTW_DEBUG,1,[Compile with extra rutime checks for debugging]) |
385 |
- fi |
386 |
- |
387 |
- AC_ARG_ENABLE(debug-alignment, [ --enable-debug-alignment enable runtime checks for alignment on x86], ok=$enableval, ok=no) |
388 |
- if test "$ok" = "yes"; then |
389 |
-- AC_DEFINE(FFTW_DEBUG_ALIGNMENT) |
390 |
-+ AC_DEFINE(FFTW_DEBUG_ALIGNMENT,1,[Enable rutime checks for alignment on x86]) |
391 |
- fi |
392 |
- |
393 |
- AC_ARG_ENABLE(vec-recurse, [ --enable-vec-recurse enable experimental performance hack], ok=$enableval, ok=no) |
394 |
- if test "$ok" = "yes"; then |
395 |
-- AC_DEFINE(FFTW_ENABLE_VECTOR_RECURSE) |
396 |
-+ AC_DEFINE(FFTW_ENABLE_VECTOR_RECURSE,1,[Enable experimental performance hack]) |
397 |
- fi |
398 |
- |
399 |
- dnl ----------------------------------------------------------------------- |
400 |
-@@ -90,7 +92,6 @@ |
401 |
- ACX_PROG_CC_EGCS |
402 |
- AC_PROG_INSTALL |
403 |
- AC_PROG_MAKE_SET |
404 |
--AC_PROG_RANLIB |
405 |
- AC_PROG_LN_S |
406 |
- AM_PROG_LIBTOOL |
407 |
- AC_CHECK_PROG(PERL, perl, perl, echo perl) |
408 |
-@@ -115,7 +116,7 @@ |
409 |
- dnl ----------------------------------------------------------------------- |
410 |
- |
411 |
- AC_SUBST(SHARED_VERSION_INFO) |
412 |
--AC_DEFINE_UNQUOTED(FFTW_VERSION, "$VERSION") |
413 |
-+AC_DEFINE_UNQUOTED(FFTW_VERSION, "$VERSION",[Fftw Version]) |
414 |
- |
415 |
- # Get the version number that will be appended to shared libraries: |
416 |
- SHARED_VERSION=`echo $SHARED_VERSION_INFO | awk -F':' '{ print $1 "." $3 "." $2 }'` |
417 |
-@@ -123,7 +124,7 @@ |
418 |
- |
419 |
- ACX_PROG_CC_MAXOPT |
420 |
- |
421 |
--ACX_GCC_ALIGNS_STACK(AC_DEFINE(FFTW_GCC_ALIGNS_STACK), [ |
422 |
-+ACX_GCC_ALIGNS_STACK(AC_DEFINE(FFTW_GCC_ALIGNS_STACK,1,[Gcc align stack]), [ |
423 |
- if test "$enable_i386_hacks" = yes; then |
424 |
- if test "${acx_gcc_stack_align_bug-no}" = yes; then |
425 |
- # we are using a gcc with a stack alignment bug, and we should |
426 |
-@@ -183,7 +184,7 @@ |
427 |
- AC_TRY_LINK([#include <math.h> |
428 |
- ], if (!isnan(3.14159)) isnan(2.7183);, ok=yes, ok=no) |
429 |
- if test "$ok" = "yes"; then |
430 |
-- AC_DEFINE(HAVE_ISNAN) |
431 |
-+ AC_DEFINE(HAVE_ISNAN,1,[Have isnan]) |
432 |
- fi |
433 |
- AC_MSG_RESULT(${ok}) |
434 |
- |
435 |
-@@ -196,7 +197,7 @@ |
436 |
- #endif |
437 |
- ], [hrtime_t foobar;], ok=yes, ok=no) |
438 |
- if test "$ok" = "yes"; then |
439 |
-- AC_DEFINE(HAVE_HRTIME_T) |
440 |
-+ AC_DEFINE(HAVE_HRTIME_T,1,[Have hrtime_t type]) |
441 |
- fi |
442 |
- AC_MSG_RESULT(${ok}) |
443 |
- |
444 |
-@@ -205,7 +206,7 @@ |
445 |
- |
446 |
- AC_ARG_ENABLE(unsafe-mulmod, [ --enable-unsafe-mulmod risk overflow for large prime sizes], enable_unsafe_mulmod=$enableval, enable_unsafe_mulmod=no) |
447 |
- if test "$enable_unsafe_mulmod" = "yes"; then |
448 |
-- AC_DEFINE(FFTW_ENABLE_UNSAFE_MULMOD) |
449 |
-+ AC_DEFINE(FFTW_ENABLE_UNSAFE_MULMOD,1,[Risk overflow for lar prime sizes]) |
450 |
- fi |
451 |
- |
452 |
- |
453 |
-@@ -221,15 +222,25 @@ |
454 |
- FFTW_THREADS_INCLUDELIST="" |
455 |
- FFTW_THREADS_PROGLIST="" |
456 |
- THREADLIBS="" |
457 |
-+omp_enabler=unknown |
458 |
- if test "$enable_threads" = "yes"; then |
459 |
- if test "$with_openmp"x != nox; then |
460 |
- AC_MSG_CHECKING(how to enable OpenMP) |
461 |
-- omp_enabler=unknown |
462 |
- save_CFLAGS="$CFLAGS" |
463 |
- CFLAGS="$save_CFLAGS -omp" |
464 |
- AC_TRY_LINK_FUNC(omp_set_num_threads,THREADLIBS=" " |
465 |
- omp_enabler="$CC -omp") |
466 |
- if test -z "$THREADLIBS"; then |
467 |
-+ CFLAGS="$save_CFLAGS -fopenmp" |
468 |
-+ AC_TRY_LINK_FUNC(omp_set_num_threads,THREADLIBS="-lgomp" |
469 |
-+ omp_enabler="$CC -fopenmp") |
470 |
-+ fi |
471 |
-+ if test -z "$THREADLIBS"; then |
472 |
-+ CFLAGS="$save_CFLAGS -openmp" |
473 |
-+ AC_TRY_LINK_FUNC(omp_set_num_threads,THREADLIBS=" " |
474 |
-+ omp_enabler="$CC -openmp") |
475 |
-+ fi |
476 |
-+ if test -z "$THREADLIBS"; then |
477 |
- CFLAGS="$save_CFLAGS -mp" |
478 |
- AC_TRY_LINK_FUNC(omp_set_num_threads,THREADLIBS=" " |
479 |
- omp_enabler="$CC -mp") |
480 |
-@@ -240,68 +251,70 @@ |
481 |
- omp_enabler="automatic") |
482 |
- fi |
483 |
- AC_MSG_RESULT($omp_enabler) |
484 |
-- if test -z "$THREADLIBS"; then |
485 |
-- AC_MSG_ERROR([don't know how to enable OpenMP]) |
486 |
-+ if test x"$omp_enabler" != x"unknown"; then |
487 |
-+ AC_DEFINE(FFTW_USING_OPENMP_THREADS,1,[Using OpenMP threads]) |
488 |
-+ else |
489 |
-+ AC_MSG_WARN([don't know how to enable OpenMP, reverting to POSIX threads]) |
490 |
- fi |
491 |
-- AC_DEFINE(FFTW_USING_OPENMP_THREADS) |
492 |
-+ |
493 |
- fi |
494 |
- if test "$with_sgimp"x != nox; then |
495 |
- AC_MSG_CHECKING(how to enable SGI MP) |
496 |
- mp_enabler=unknown |
497 |
- save_CFLAGS="$CFLAGS" |
498 |
- CFLAGS="$save_CFLAGS -mp" |
499 |
-- AC_TRY_LINK_FUNC(mp_set_numthreads,THREADLIBS=" " |
500 |
-+ AC_TRY_LINK_FUNC(mp_set_numthreads,THREADLIBS="" |
501 |
- mp_enabler="$CC -mp") |
502 |
- if test -z "$THREADLIBS"; then |
503 |
- CFLAGS="$save_CFLAGS" |
504 |
-- AC_TRY_LINK_FUNC(mp_numthreads,THREADLIBS=" " |
505 |
-+ AC_TRY_LINK_FUNC(mp_numthreads,THREADLIBS="" |
506 |
- mp_enabler="automatic") |
507 |
- fi |
508 |
- AC_MSG_RESULT($mp_enabler) |
509 |
- if test -z "$THREADLIBS"; then |
510 |
- AC_MSG_ERROR([don't know how to enable SGI MP]) |
511 |
- fi |
512 |
-- AC_DEFINE(FFTW_USING_SGIMP_THREADS) |
513 |
-+ AC_DEFINE(FFTW_USING_SGIMP_THREADS,1,[Using SGIMP Threads]) |
514 |
- fi |
515 |
- |
516 |
- # POSIX threads, the default choice: |
517 |
-- if test -z "$THREADLIBS"; then |
518 |
-+ if test x"$omp_enabler" = x"unknown" ; then |
519 |
- sinclude(acx_pthread.m4) |
520 |
- ACX_PTHREAD([THREADLIBS="$PTHREAD_LIBS " |
521 |
- CFLAGS="$CFLAGS $PTHREAD_CFLAGS" |
522 |
- CC="$PTHREAD_CC" |
523 |
-- AC_DEFINE(FFTW_USING_POSIX_THREADS)]) |
524 |
-+ AC_DEFINE(FFTW_USING_POSIX_THREADS,1,[Using POSIX Threads])]) |
525 |
- fi |
526 |
- # Solaris threads: |
527 |
- if test -z "$THREADLIBS"; then |
528 |
- AC_CHECK_LIB(thread, thr_create, |
529 |
- [THREADLIBS="-lthread" |
530 |
-- AC_DEFINE(FFTW_USING_SOLARIS_THREADS)]) |
531 |
-+ AC_DEFINE(FFTW_USING_SOLARIS_THREADS,1,[Using SOLARIS Threads])]) |
532 |
- fi |
533 |
- # Mach C threads: |
534 |
- if test -z "$THREADLIBS"; then |
535 |
- AC_CHECK_FUNC(cthread_fork, |
536 |
- [THREADLIBS=" " |
537 |
-- AC_DEFINE(FFTW_USING_MACH_THREADS)]) |
538 |
-+ AC_DEFINE(FFTW_USING_MACH_THREADS,1,[Using Mach Threads])]) |
539 |
- AC_CHECK_HEADERS(mach/cthreads.h cthreads.h cthread.h) |
540 |
- fi |
541 |
- if test -z "$THREADLIBS"; then |
542 |
- AC_CHECK_LIB(cthread, cthread_fork, |
543 |
- [THREADLIBS="-lcthread" |
544 |
-- AC_DEFINE(FFTW_USING_MACH_THREADS)]) |
545 |
-+ AC_DEFINE(FFTW_USING_MACH_THREADS,1,[Using Mach Threads])]) |
546 |
- AC_CHECK_HEADERS(mach/cthreads.h cthreads.h cthread.h) |
547 |
- fi |
548 |
- if test -z "$THREADLIBS"; then |
549 |
- AC_CHECK_LIB(cthreads, cthread_fork, |
550 |
- [THREADLIBS="-lcthreads" |
551 |
-- AC_DEFINE(FFTW_USING_MACH_THREADS)]) |
552 |
-+ AC_DEFINE(FFTW_USING_MACH_THREADS,1,[Using Mach Threads])]) |
553 |
- AC_CHECK_HEADERS(mach/cthreads.h cthreads.h cthread.h) |
554 |
- fi |
555 |
- # BeOS threads: |
556 |
- if test -z "$THREADLIBS"; then |
557 |
- AC_CHECK_FUNC(spawn_thread, |
558 |
- [THREADLIBS=" " |
559 |
-- AC_DEFINE(FFTW_USING_BEOS_THREADS)]) |
560 |
-+ AC_DEFINE(FFTW_USING_BEOS_THREADS,1,[Using BEOS Threads])]) |
561 |
- fi |
562 |
- if test -z "$THREADLIBS"; then |
563 |
- AC_MSG_ERROR(couldn't find threads library for --enable-threads) |
564 |
-@@ -334,7 +347,7 @@ |
565 |
- CC="$MPICC" |
566 |
- ok=yes |
567 |
- AC_TRY_LINK([#include <mpi.h> |
568 |
-- ], [MPI_Comm_f2c(0);], [AC_DEFINE(HAVE_MPI_COMM_F2C)], [ok=no]) |
569 |
-+ ], [MPI_Comm_f2c(0);], [AC_DEFINE(HAVE_MPI_COMM_F2C,1,[Has MPI COMM F2C])], [ok=no]) |
570 |
- AC_MSG_RESULT($ok) |
571 |
- CC="$save_CC" |
572 |
- else |
573 |
|
574 |
diff --git a/sci-libs/fftw/files/fftw-2.1.5-no-test.patch b/sci-libs/fftw/files/fftw-2.1.5-no-test.patch |
575 |
deleted file mode 100644 |
576 |
index cc844a455e6..00000000000 |
577 |
--- a/sci-libs/fftw/files/fftw-2.1.5-no-test.patch |
578 |
+++ /dev/null |
579 |
@@ -1,33 +0,0 @@ |
580 |
---- a/tests/Makefile.am |
581 |
-+++ b/tests/Makefile.am |
582 |
-@@ -1,4 +1,4 @@ |
583 |
--noinst_PROGRAMS = fftw_test rfftw_test |
584 |
-+check_PROGRAMS = fftw_test rfftw_test |
585 |
- noinst_HEADERS = test_main.h |
586 |
- |
587 |
- FFTWDIR=../fftw |
588 |
---- a/mpi/Makefile.am |
589 |
-+++ b/mpi/Makefile.am |
590 |
-@@ -4,8 +4,8 @@ |
591 |
- |
592 |
- lib_LTLIBRARIES = @FFTW_MPI_LIBLIST@ |
593 |
- include_HEADERS = @FFTW_MPI_INCLUDELIST@ |
594 |
--noinst_PROGRAMS = @FFTW_MPI_PROGLIST@ |
595 |
-+check_PROGRAMS = @FFTW_MPI_PROGLIST@ |
596 |
- |
597 |
- EXTRA_LTLIBRARIES = lib@FFTW_PREFIX@fftw_mpi.la \ |
598 |
- lib@FFTW_PREFIX@rfftw_mpi.la |
599 |
- EXTRA_HEADERS = @FFTW_PREFIX@fftw_mpi.h @FFTW_PREFIX@rfftw_mpi.h |
600 |
---- a/threads/Makefile.am |
601 |
-+++ b/threads/Makefile.am |
602 |
-@@ -4,9 +4,9 @@ |
603 |
- |
604 |
- lib_LTLIBRARIES = @FFTW_THREADS_LIBLIST@ |
605 |
- include_HEADERS = @FFTW_THREADS_INCLUDELIST@ |
606 |
--noinst_PROGRAMS = @FFTW_THREADS_PROGLIST@ |
607 |
-+check_PROGRAMS = @FFTW_THREADS_PROGLIST@ |
608 |
- |
609 |
- EXTRA_LTLIBRARIES = lib@FFTW_PREFIX@fftw_threads.la \ |
610 |
- lib@FFTW_PREFIX@rfftw_threads.la |
611 |
- EXTRA_HEADERS = @FFTW_PREFIX@fftw_threads.h \ |
612 |
- @FFTW_PREFIX@rfftw_threads.h |
613 |
|
614 |
diff --git a/sci-libs/fftw/files/fftw-2.1.5-parallel-tests.patch b/sci-libs/fftw/files/fftw-2.1.5-parallel-tests.patch |
615 |
deleted file mode 100644 |
616 |
index b92e6dad299..00000000000 |
617 |
--- a/sci-libs/fftw/files/fftw-2.1.5-parallel-tests.patch |
618 |
+++ /dev/null |
619 |
@@ -1,105 +0,0 @@ |
620 |
-Fix failure of parallel test suite. This is due to |
621 |
-misspecification of the test suite, which requires |
622 |
-first compiling $(check_PROGRAMS) and only then |
623 |
-running $(TESTS): |
624 |
- |
625 |
-* check-am: all-am |
626 |
-* $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) |
627 |
-* $(MAKE) $(AM_MAKEFLAGS) check-TESTS |
628 |
- |
629 |
-The old build system never specified $(TESTS) and |
630 |
-erroneously made the check target depend on the |
631 |
-two tests. |
632 |
-See also: https://bugs.gentoo.org/show_bug.cgi?id=603352 |
633 |
- |
634 |
---- a/tests/Makefile.am |
635 |
-+++ b/tests/Makefile.am |
636 |
-@@ -12,22 +12,7 @@ |
637 |
- rfftw_test_LDADD = $(RFFTWDIR)/lib@FFTW_PREFIX@×××××.la \ |
638 |
- $(FFTWDIR)/lib@FFTW_PREFIX@××××.la |
639 |
- |
640 |
--check: fftw-tests rfftw-tests |
641 |
-+TESTS = myfftwtests.sh myrfftwtests.sh |
642 |
- |
643 |
--fftw-tests: fftw_test |
644 |
-- ./fftw_test -p 0 |
645 |
-- ./fftw_test -x 128 -a 0 |
646 |
-- ./fftw_test -x 32 -a 2 |
647 |
-- ./fftw_test -x 100 -r 0 |
648 |
-- @echo "--------------------------------------------------------------" |
649 |
-- @echo " FFTW complex-complex transforms passed tests!" |
650 |
-- @echo "--------------------------------------------------------------" |
651 |
-- |
652 |
--rfftw-tests: rfftw_test |
653 |
-- ./rfftw_test -p 0 |
654 |
-- ./rfftw_test -x 128 -a 0 |
655 |
-- ./rfftw_test -x 32 -a 2 |
656 |
-- ./rfftw_test -x 100 -r 0 |
657 |
-- @echo "--------------------------------------------------------------" |
658 |
-- @echo " RFFTW real-complex transforms passed tests!" |
659 |
-- @echo "--------------------------------------------------------------" |
660 |
-+TEST_EXTENSIONS = .sh |
661 |
-+SH_LOG_COMPILER = $(SHELL) |
662 |
---- a/tests/myfftwtests.sh |
663 |
-+++ b/tests/myfftwtests.sh |
664 |
-@@ -0,0 +1,4 @@ |
665 |
-+./fftw_test -p 0 && \ |
666 |
-+./fftw_test -x 128 -a 0 && \ |
667 |
-+./fftw_test -x 32 -a 2 && \ |
668 |
-+./fftw_test -x 100 -r 0 |
669 |
---- a/tests/myrfftwtests.sh |
670 |
-+++ b/tests/myrfftwtests.sh |
671 |
-@@ -0,0 +1,4 @@ |
672 |
-+./rfftw_test -p 0 && \ |
673 |
-+./rfftw_test -x 128 -a 0 && \ |
674 |
-+./rfftw_test -x 32 -a 2 && \ |
675 |
-+./rfftw_test -x 100 -r 0 |
676 |
---- a/threads/fftw_threads_test_check.sh |
677 |
-+++ b/threads/fftw_threads_test_check.sh |
678 |
-@@ -0,0 +1,4 @@ |
679 |
-+./fftw_threads_test 1 -x 100 -r 0 && \ |
680 |
-+./fftw_threads_test 2 -x 100 -r 0 && \ |
681 |
-+./fftw_threads_test 3 -x 100 -r 0 && \ |
682 |
-+./fftw_threads_test 10 -x 100 -r 0 |
683 |
---- a/threads/Makefile.am |
684 |
-+++ b/threads/Makefile.am |
685 |
-@@ -78,29 +78,7 @@ |
686 |
- # incorrect. Just disable autoheader |
687 |
- AUTOHEADER=echo |
688 |
- |
689 |
--check: @FFTW_THREADS_PROGLIST@ |
690 |
-- @set fnord $(MAKEFLAGS); amf=$$2; \ |
691 |
-- list='@FFTW_THREADS_PROGLIST@'; for prog in $$list; do \ |
692 |
-- target="$$prog""-check"; \ |
693 |
-- echo "Making $$target"; \ |
694 |
-- ($(MAKE) $$target) \ |
695 |
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ |
696 |
-- done && test -z "$$fail" |
697 |
-+TESTS = fftw_threads_test_check.sh rfftw_threads_test_check.sh |
698 |
- |
699 |
--fftw_threads_test-check: fftw_threads_test |
700 |
-- ./fftw_threads_test 1 -x 100 -r 0 |
701 |
-- ./fftw_threads_test 2 -x 100 -r 0 |
702 |
-- ./fftw_threads_test 3 -x 100 -r 0 |
703 |
-- ./fftw_threads_test 10 -x 100 -r 0 |
704 |
-- @echo "--------------------------------------------------------------" |
705 |
-- @echo " FFTW complex-complex threads transforms passed tests!" |
706 |
-- @echo "--------------------------------------------------------------" |
707 |
-- |
708 |
--rfftw_threads_test-check: rfftw_threads_test |
709 |
-- ./rfftw_threads_test 1 -x 100 -r 0 |
710 |
-- ./rfftw_threads_test 2 -x 100 -r 0 |
711 |
-- ./rfftw_threads_test 3 -x 100 -r 0 |
712 |
-- ./rfftw_threads_test 10 -x 100 -r 0 |
713 |
-- @echo "--------------------------------------------------------------" |
714 |
-- @echo " RFFTW real-complex threads transforms passed tests!" |
715 |
-- @echo "--------------------------------------------------------------" |
716 |
-+TEST_EXTENSIONS = .sh |
717 |
-+SH_LOG_COMPILER = $(SHELL) |
718 |
---- a/threads/rfftw_threads_test_check.sh |
719 |
-+++ b/threads/rfftw_threads_test_check.sh |
720 |
-@@ -0,0 +1,4 @@ |
721 |
-+./rfftw_threads_test 1 -x 100 -r 0 && \ |
722 |
-+./rfftw_threads_test 2 -x 100 -r 0 && \ |
723 |
-+./rfftw_threads_test 3 -x 100 -r 0 && \ |
724 |
-+./rfftw_threads_test 10 -x 100 -r 0 |
725 |
|
726 |
diff --git a/sci-libs/fftw/files/fftw-2.1.5-texinfo5.1.patch b/sci-libs/fftw/files/fftw-2.1.5-texinfo5.1.patch |
727 |
deleted file mode 100644 |
728 |
index 1947bef8f21..00000000000 |
729 |
--- a/sci-libs/fftw/files/fftw-2.1.5-texinfo5.1.patch |
730 |
+++ /dev/null |
731 |
@@ -1,21 +0,0 @@ |
732 |
- doc/fftw.texi | 6 +++--- |
733 |
- 1 file changed, 3 insertions(+), 3 deletions(-) |
734 |
- |
735 |
-diff --git a/doc/fftw.texi b/doc/fftw.texi |
736 |
-index 90e8bb6..85a7a53 100644 |
737 |
---- a/doc/fftw.texi |
738 |
-+++ b/doc/fftw.texi |
739 |
-@@ -46,10 +46,10 @@ approved by the Free Software Foundation. |
740 |
- @titlepage |
741 |
- @sp 10 |
742 |
- @comment The title is printed in a large font. |
743 |
--@title{FFTW User's Manual} |
744 |
-+@title FFTW User's Manual |
745 |
- @subtitle For version @value{VERSION}, @value{UPDATED} |
746 |
--@author{Matteo Frigo} |
747 |
--@author{Steven G. Johnson} |
748 |
-+@author Matteo Frigo |
749 |
-+@author Steven G. Johnson |
750 |
- |
751 |
- @c The following two commands start the copyright page. |
752 |
- @page |
753 |
|
754 |
diff --git a/sci-libs/fftw/metadata.xml b/sci-libs/fftw/metadata.xml |
755 |
index c884ae1bb93..bf126e2d080 100644 |
756 |
--- a/sci-libs/fftw/metadata.xml |
757 |
+++ b/sci-libs/fftw/metadata.xml |
758 |
@@ -15,8 +15,6 @@ |
759 |
publicly available FFT software. |
760 |
</longdescription> |
761 |
<use> |
762 |
- <flag name="float">Link default library to single precision instead of |
763 |
- double (symlinks only and fftw-2.1)</flag> |
764 |
<flag name="zbus">Adds support for ZBus cycle-counter of mips</flag> |
765 |
</use> |
766 |
<upstream> |