summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/packages/algebra.scm16
-rw-r--r--gnu/packages/audio.scm4
-rw-r--r--gnu/packages/music.scm4
3 files changed, 20 insertions, 4 deletions
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 76f385e340..4288913f78 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -576,6 +576,22 @@ cosine/ sine transforms or DCT/DST).")
(string-append (package-description fftw)
" Single-precision version."))))
+;; 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
+ (package (inherit fftw)
+ (arguments
+ (substitute-keyword-arguments (package-arguments fftw)
+ ((#:configure-flags flags)
+ `(cons "--enable-threads" ,flags))))))
+
+(define-public fftwf-with-threads
+ (package (inherit fftwf)
+ (arguments
+ (substitute-keyword-arguments (package-arguments fftwf)
+ ((#:configure-flags flags)
+ `(cons "--enable-threads" ,flags))))))
+
(define-public fftw-openmpi
(package (inherit fftw)
(name "fftw-openmpi")
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index b535448af1..66db4c52c6 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -238,8 +238,8 @@ namespace ARDOUR { const char* revision = \"5.4\" ; }"))))
("lv2" ,lv2)
("vamp" ,vamp)
("curl" ,curl)
- ("fftw" ,fftw)
- ("fftwf" ,fftwf)
+ ("fftw" ,fftw-with-threads)
+ ("fftwf" ,fftwf-with-threads)
("jack" ,jack-1)
("serd" ,serd)
("sord" ,sord)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 78ca558b2d..188791976c 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1744,8 +1744,8 @@ analogue-like user interface.")
#t)))))
(inputs
`(("lilv" ,lilv)
- ("fftw" ,fftw)
- ("fftwf" ,fftwf)
+ ("fftw" ,fftw-with-threads)
+ ("fftwf" ,fftwf-with-threads)
("lv2" ,lv2)
("jack" ,jack-1)
("readline" ,readline)))