[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/2] Revert "gnu: Add threaded variants of fftw and fftwf for Ard
From: |
David Craven |
Subject: |
[PATCH 1/2] Revert "gnu: Add threaded variants of fftw and fftwf for Ardour and mod-host." |
Date: |
Sat, 7 Jan 2017 19:10:12 +0100 |
These variants are no longer needed.
This reverts commit 45591fd7fde1a400a416cb99939f6dd766445f94.
---
gnu/packages/algebra.scm | 17 -----------------
gnu/packages/audio.scm | 4 ++--
gnu/packages/music.scm | 4 ++--
3 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index d09e2e83b..b859da0e7 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 f0a6a54de..f3a337925 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 59fd508f6..fc4f15cd7 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)))
--
2.11.0
- Re: Staging freeze, (continued)
- Re: Staging freeze, Ludovic Courtès, 2017/01/04
- Re: Let’s fix build failures on ‘staging’!, Leo Famulari, 2017/01/07
- Re: Let’s fix build failures on ‘staging’!, Leo Famulari, 2017/01/07
- Re: Let’s fix build failures on ‘staging’!, Ludovic Courtès, 2017/01/07
- Re: Let’s fix build failures on ‘staging’!, Leo Famulari, 2017/01/07
- Re: Let’s fix build failures on ‘staging’!, Leo Famulari, 2017/01/08
[PATCH 1/2] Revert "gnu: Add threaded variants of fftw and fftwf for Ardour and mod-host.",
David Craven <=
- [PATCH 2/2] gnu: ardour: Add eudev dependency., David Craven, 2017/01/07
- Re: [PATCH 1/2] Revert "gnu: Add threaded variants of fftw and fftwf for Ardour and mod-host.", Ricardo Wurmus, 2017/01/07
- Re: [PATCH 1/2] Revert "gnu: Add threaded variants of fftw and fftwf for Ardour and mod-host.", David Craven, 2017/01/07
- Re: [PATCH 1/2] Revert "gnu: Add threaded variants of fftw and fftwf for Ardour and mod-host.", David Craven, 2017/01/07
- Re: [PATCH 1/2] Revert "gnu: Add threaded variants of fftw and fftwf for Ardour and mod-host.", Ludovic Courtès, 2017/01/08
Re: [PATCH 1/2] Revert "gnu: Add threaded variants of fftw and fftwf for Ardour and mod-host.", Ricardo Wurmus, 2017/01/08