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

[Mark H. Weaver]

mhw pushed a commit to branch master
in repository guix.

commit c96cb01a8894430f4b472b0fc9ae1fe99f81fb38
Author: David Craven <address@hidden>
Date:   Sat Jan 7 18:56:10 2017 +0100

    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.
---
 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 d09e2e8..b859da0 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 f0a6a54..f3a3379 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 f03bda7..f3e26cb 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)))