aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Craven <david@craven.ch>2017-01-07 18:56:10 +0100
committerMark H Weaver <mhw@netris.org>2017-01-11 11:23:43 -0500
commitc96cb01a8894430f4b472b0fc9ae1fe99f81fb38 (patch)
tree181aad047ebfcf958fcc60487c6ae2c5807ca007
parent9e485ffa1b90e90207f53fcf58f43e29b639f852 (diff)
downloadguix-c96cb01a8894430f4b472b0fc9ae1fe99f81fb38.tar
guix-c96cb01a8894430f4b472b0fc9ae1fe99f81fb38.tar.gz
Revert "gnu: Add threaded variants of fftw and fftwf for Ardour and mod-host."
These variants are no longer needed. Followup to 86f4e9d76a75c405b3b6c5b3f1717df0e45f4e68. This reverts commit 45591fd7fde1a400a416cb99939f6dd766445f94.
-rw-r--r--gnu/packages/algebra.scm17
-rw-r--r--gnu/packages/audio.scm4
-rw-r--r--gnu/packages/music.scm4
3 files changed, 4 insertions, 21 deletions
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index d09e2e83b2..b859da0e7e 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -577,23 +577,6 @@ cosine/ sine transforms or DCT/DST).")
(string-append (package-description fftw)
" Single-precision version."))))
-(define (pthread-variant p)
- (package
- (inherit p)
- (name (string-append (package-name p) "-pthreads"))
- (arguments
- (substitute-keyword-arguments (package-arguments fftw)
- ((#:configure-flags flags)
- `(cons "--enable-threads" ,flags))))))
-
-;; FIXME: These packages are used temporarily by packages like Ardour until
-;; "--enable-flags" is added to the fftw and fftwf packages.
-(define-public fftw-with-threads
- (pthread-variant fftw))
-
-(define-public fftwf-with-threads
- (pthread-variant fftwf))
-
(define-public fftw-openmpi
(package (inherit fftw)
(name "fftw-openmpi")
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index f0a6a54de7..f3a3379257 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -238,8 +238,8 @@ namespace ARDOUR { const char* revision = \"" version "\" ; }")))))
("lv2" ,lv2)
("vamp" ,vamp)
("curl" ,curl)
- ("fftw" ,fftw-with-threads)
- ("fftwf" ,fftwf-with-threads)
+ ("fftw" ,fftw)
+ ("fftwf" ,fftwf)
("jack" ,jack-1)
("serd" ,serd)
("sord" ,sord)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index f03bda7987..f3e26cb920 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1889,8 +1889,8 @@ analogue-like user interface.")
#t)))))
(inputs
`(("lilv" ,lilv)
- ("fftw" ,fftw-with-threads)
- ("fftwf" ,fftwf-with-threads)
+ ("fftw" ,fftw)
+ ("fftwf" ,fftwf)
("lv2" ,lv2)
("jack" ,jack-1)
("readline" ,readline)))