Revert "gnu: Add threaded variants of fftw and fftwf for Ardour and mod-host."

These variants are no longer needed.

Followup to 86f4e9d76a.

This reverts commit 45591fd7fd.
This commit is contained in:
David Craven 2017-01-07 18:56:10 +01:00 committed by Mark H Weaver
parent 9e485ffa1b
commit c96cb01a88
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
3 changed files with 4 additions and 21 deletions

View File

@ -577,23 +577,6 @@ cosine/ sine transforms or DCT/DST).")
(string-append (package-description fftw) (string-append (package-description fftw)
" Single-precision version.")))) " 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 (define-public fftw-openmpi
(package (inherit fftw) (package (inherit fftw)
(name "fftw-openmpi") (name "fftw-openmpi")

View File

@ -238,8 +238,8 @@ namespace ARDOUR { const char* revision = \"" version "\" ; }")))))
("lv2" ,lv2) ("lv2" ,lv2)
("vamp" ,vamp) ("vamp" ,vamp)
("curl" ,curl) ("curl" ,curl)
("fftw" ,fftw-with-threads) ("fftw" ,fftw)
("fftwf" ,fftwf-with-threads) ("fftwf" ,fftwf)
("jack" ,jack-1) ("jack" ,jack-1)
("serd" ,serd) ("serd" ,serd)
("sord" ,sord) ("sord" ,sord)

View File

@ -1889,8 +1889,8 @@ analogue-like user interface.")
#t))))) #t)))))
(inputs (inputs
`(("lilv" ,lilv) `(("lilv" ,lilv)
("fftw" ,fftw-with-threads) ("fftw" ,fftw)
("fftwf" ,fftwf-with-threads) ("fftwf" ,fftwf)
("lv2" ,lv2) ("lv2" ,lv2)
("jack" ,jack-1) ("jack" ,jack-1)
("readline" ,readline))) ("readline" ,readline)))