From mboxrd@z Thu Jan 1 00:00:00 1970 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 Message-ID: <20170107181013.17984-1-david@craven.ch> References: <87shoyfoe7.fsf@gnu.org> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46592) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cPvS4-00042U-AN for guix-devel@gnu.org; Sat, 07 Jan 2017 13:10:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cPvS1-0001Bz-5E for guix-devel@gnu.org; Sat, 07 Jan 2017 13:10:48 -0500 Received: from so254-10.mailgun.net ([198.61.254.10]:36084) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cPvS0-0001Bq-Vw for guix-devel@gnu.org; Sat, 07 Jan 2017 13:10:45 -0500 In-Reply-To: <87shoyfoe7.fsf@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@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