From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id EIMZHBeSQGOALQAAbAwnHQ (envelope-from ) for ; Fri, 07 Oct 2022 22:54:47 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id SNoCHBeSQGOAcAAAauVa8A (envelope-from ) for ; Fri, 07 Oct 2022 22:54:47 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4668EF1CB for ; Fri, 7 Oct 2022 22:54:47 +0200 (CEST) Received: from localhost ([::1]:46856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oguMo-0006DK-EV for larch@yhetil.org; Fri, 07 Oct 2022 16:54:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oguM8-0005W5-BJ for guix-patches@gnu.org; Fri, 07 Oct 2022 16:54:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38475) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oguM7-0002yG-VS for guix-patches@gnu.org; Fri, 07 Oct 2022 16:54:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oguM7-0003x4-Qs for guix-patches@gnu.org; Fri, 07 Oct 2022 16:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58365] [PATCH 4/6] guile-ffi-fftw: Modernise style. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 07 Oct 2022 20:54:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58365 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58365@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 58365-submit@debbugs.gnu.org id=B58365.166517604115155 (code B ref 58365); Fri, 07 Oct 2022 20:54:03 +0000 Received: (at 58365) by debbugs.gnu.org; 7 Oct 2022 20:54:01 +0000 Received: from localhost ([127.0.0.1]:37547 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oguM5-0003wC-4X for submit@debbugs.gnu.org; Fri, 07 Oct 2022 16:54:01 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:40946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oguM0-0003v4-LX for 58365@debbugs.gnu.org; Fri, 07 Oct 2022 16:53:58 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16]) by laurent.telenet-ops.be with bizsmtp id V8tu2800920ykKC018tvFR; Fri, 07 Oct 2022 22:53:55 +0200 From: Maxime Devos Date: Fri, 7 Oct 2022 22:53:50 +0200 Message-Id: <20221007205352.1282-4-maximedevos@telenet.be> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221007205352.1282-1-maximedevos@telenet.be> References: <20221007205352.1282-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1665176035; bh=lG2k5hn/qrsrgU1bAoLtbakH1bjt9nR7foNGcsSmVdg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CosOHsRJbYGaqP18bWdkP0z67a79c6lDcXlq8xV/IyktxK1ZNKS6txJBxz7zKjafP pxeAWy4liVjYPVg55BJajg9JNTsHOR2jTg4CosuVe8CJ3Jc9l/WK2w7EePmZM4YguX RxDTf+qWdGfBYnvtbPo/rUP49Rx61agwVueRH2HkuHvFsxqVrFtTQf1spuFjUxeCHj uT0lh9nIrRDQq6DARC58mv3rA9QxmhxhlMxsDmHPigOUQI9HJ6d2xr0O5M54hGAhAO ejQ+3CGiMCKbFK8IJ74kMnDl9FqhIxHuZuyPJkwy7zbKZuQXP8dkvnMNHOjm0vf3Wh 3a3UgQXWC6BPQ== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1665176087; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=lG2k5hn/qrsrgU1bAoLtbakH1bjt9nR7foNGcsSmVdg=; b=iJcjox4JKHy0pQToR/4lyTxQjgZToT2Meh6Do19vAv5ktfZ5VEFu/NKVbaQm8uFeKuZm4E nplbizov5QwRsOto1F0HUq9LH+xjG8zI7jQ3YDul6Ca0Ij+1pVpbLu7y1xyf8I30i4RZyd 8lqYyDnrfcvHRt4Z34L3QEzOvIsAF0JzlD5GjUgn6FkFmNexIEI4233hPDI+YD+8zBDpW0 nTPKuuC0iIh4WkbJx+skSleTwEXi/do9rajwaoShDx3efwCO9zAeKbLw9jEDz5ZauciMIK yoX5PuJYbgL4l23P8Ss6/ykpEmNOh4/gppZw+9nnuhw17adRIZUlCx/j/1CQBA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1665176087; a=rsa-sha256; cv=none; b=caOFeiRN15wVS6uB8Ek5rVC45C67VftF5E1Ct8cgh536GkrUINnTH8xb4KNSjq8n25LV2q XFToOZz+7JV6hSFoFYGPaHAOGZq0TbWYaC3s1iQ73RbMhU3JXwlZ6CvTq/sLT6XVYome+k 737nek38dOexOBmIEYquSKCmels7VErkfB9FcCPJxOBZToNS+OJ+yYh+QFXtuf8HJeESus lv7jl91bdSYC7bjaSJ89Dr9Zlsbh54x/iM0B2NWbkuOyQQiZULa3H5HX21fIAPpcvBOJba P2S10Gb9tglZSS05QmX3eBCXqYGfRFCzaigpaacdVEW255aIMaA/FSoNYU93EQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b=CosOHsRJ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 6.63 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b=CosOHsRJ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 4668EF1CB X-Spam-Score: 6.63 X-Migadu-Scanner: scn0.migadu.com X-TUID: vqhpc86wp/1Y The 'object->string' change is more a personal thing. "guix style" adds modify-phases on the same line as #:phases, causing the 80-columns limit to be exceeded, so it has been partially ignored. * gnu/packages/guile-xyz.scm (guile-ffi-fftw)[arguments]<#:test-script>: Set it. [arguments]{#:phases}{check}: Remove custom phase. [native-inputs]: Add native-input required by uncustomised 'check' phase. --- gnu/packages/guile-xyz.scm | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 2ab5683d19..a664e37968 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -3681,22 +3681,23 @@ (define-public guile-ffi-fftw "08j40a5p6a8pgvhffmzb5rfdnrav2mksy3gfjkdqy93jfj1z5afg")))) (build-system guile-build-system) (arguments - `(#:source-directory "mod" - #:test-script "../test/test-ffi-fftw.scm" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'prepare-build - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "mod/ffi/fftw.scm" - (("\\(getenv \"GUILE_FFI_FFTW_LIBFFTW3_PATH\"\\)") - (format #f "\"~a/lib\"" (assoc-ref inputs "fftw")))) - #t))))) + (list #:source-directory "mod" + #:test-script "../test/test-ffi-fftw.scm" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'prepare-build + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "mod/ffi/fftw.scm" + (("\\(getenv \"GUILE_FFI_FFTW_LIBFFTW3_PATH\"\\)") + (object->string + (dirname + (search-input-file inputs "lib/libfftw3.so")))))))))) (native-inputs (list guile-test-driver)) - (inputs - (list fftw guile-2.2)) + (inputs (list fftw guile-2.2)) (home-page "https://github.com/lloda/guile-ffi-fftw/") (synopsis "Access FFTW through Guile's FFI") - (description "This is a minimal set of Guile FFI bindings for the FFTW + (description + "This is a minimal set of Guile FFI bindings for the FFTW library's ‘guru interface’. It provides two functions: @code{fftw-dft! rank sign in out} and @code{fftw-dft rank sign in}. These bindings being minimal, there is no support for computing & reusing plans, or split r/i transforms, or -- 2.37.3