all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Maxime Devos <maximedevos@telenet.be>
To: 58365@debbugs.gnu.org
Cc: Maxime Devos <maximedevos@telenet.be>
Subject: [bug#58365] [PATCH 4/6] guile-ffi-fftw: Modernise style.
Date: Fri,  7 Oct 2022 22:53:50 +0200	[thread overview]
Message-ID: <20221007205352.1282-4-maximedevos@telenet.be> (raw)
In-Reply-To: <20221007205352.1282-1-maximedevos@telenet.be>

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





  parent reply	other threads:[~2022-10-07 20:54 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-07 20:47 [bug#58365] [PATCH 0/6] Support #:tests? in guile-build-system Maxime Devos
2022-10-07 20:53 ` [bug#58365] [PATCH 1/6] gnu: Add guile-test-driver Maxime Devos
2022-10-07 20:53   ` [bug#58365] [PATCH 2/6] build-system/guile: Run SRFI-64 tests Maxime Devos
2022-10-07 20:53   ` [bug#58365] [PATCH 3/6] guile-ffi-fftw: Respect #:tests? Maxime Devos
2022-10-07 20:53   ` Maxime Devos [this message]
2022-10-07 20:53   ` [bug#58365] [PATCH 5/6] guile-ffi-fftw: Update to new Guile version Maxime Devos
2022-10-07 20:53   ` [bug#58365] [PATCH 6/6] guile-ac-d-bus: Don't duplicate 'check' phase Maxime Devos
2022-10-18 12:36   ` [bug#58365] [PATCH 0/6] Support #:tests? in guile-build-system Ludovic Courtès
2022-10-18 13:30     ` Maxime Devos
2022-10-18 15:44       ` Ludovic Courtès
2023-11-20  0:34         ` Maxime Devos
2023-11-20  0:41           ` Maxime Devos
2023-12-03  9:17           ` Efraim Flashner

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221007205352.1282-4-maximedevos@telenet.be \
    --to=maximedevos@telenet.be \
    --cc=58365@debbugs.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 external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.