From: David Craven <david@craven.ch>
To: guix-devel@gnu.org
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 [thread overview]
Message-ID: <20170107181013.17984-1-david@craven.ch> (raw)
In-Reply-To: <87shoyfoe7.fsf@gnu.org>
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
next prev parent reply other threads:[~2017-01-07 18:10 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-23 5:23 Staging freeze Leo Famulari
2016-12-23 6:00 ` John Darrington
2016-12-26 18:16 ` Leo Famulari
2016-12-27 23:56 ` Leo Famulari
2016-12-28 4:13 ` Leo Famulari
2016-12-28 9:17 ` John Darrington
2016-12-29 17:16 ` Leo Famulari
2016-12-29 17:51 ` Ludovic Courtès
2016-12-29 18:42 ` Leo Famulari
2016-12-31 11:12 ` Ludovic Courtès
2017-01-04 8:45 ` Leo Famulari
2017-01-04 22:31 ` Ludovic Courtès
2017-01-07 11:50 ` Let’s fix build failures on ‘staging’! Ludovic Courtès
2017-01-07 17:15 ` Fix python-pygpgme FTBFS [was Re: Let’s fix build failures on ‘staging’!] Leo Famulari
2017-01-07 21:31 ` Ludovic Courtès
2017-01-07 21:46 ` Leo Famulari
2017-01-07 17:22 ` Let’s fix build failures on ‘staging’! Leo Famulari
2017-01-07 17:35 ` Leo Famulari
2017-01-07 21:32 ` Ludovic Courtès
2017-01-07 21:46 ` Leo Famulari
2017-01-08 17:19 ` Leo Famulari
2017-01-07 18:10 ` David Craven [this message]
2017-01-07 18:10 ` [PATCH 2/2] gnu: ardour: Add eudev dependency David Craven
2017-01-07 19:11 ` [PATCH 1/2] Revert "gnu: Add threaded variants of fftw and fftwf for Ardour and mod-host." Ricardo Wurmus
2017-01-07 22:43 ` David Craven
2017-01-07 22:45 ` David Craven
2017-01-08 10:57 ` Ludovic Courtès
2017-01-08 7:23 ` Ricardo Wurmus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170107181013.17984-1-david@craven.ch \
--to=david@craven.ch \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).