unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 55449@debbugs.gnu.org
Cc: Tobias Geerinckx-Rice <me@tobias.gr>,
	Maxime Devos <maximedevos@telenet.be>
Subject: bug#55449: [PATCH] gnu: recutils: Use correct bash headers.
Date: Sat, 4 Jun 2022 10:30:12 +0200	[thread overview]
Message-ID: <18b93bc799d759f48d0645f971104277f2a3b066.camel@gmail.com> (raw)
In-Reply-To: <9841253361ff5e3caccd4702518c70bdba8ac622.camel@ist.tugraz.at>

* gnu/packages/databases.scm (recutils)[arguments]: Convert to G-Expressions.
Drop gratuitous dirname.
[native-inputs]: Drop labels.  Move bash:include...
[inputs]: ... here.  Also add regular bash.
---
 gnu/packages/databases.scm | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 09d825af3e..5cd8cc2fa3 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1527,20 +1527,17 @@ (define-public recutils
     (build-system gnu-build-system)
     (arguments
      (list #:configure-flags
-           '(list "--disable-static"
-                  (string-append "--with-bash-headers="
-                                 (dirname (search-input-directory
-                                           %build-inputs
-                                           "include/bash"))))))
+           #~(list "--disable-static"
+                   (string-append "--with-bash-headers="
+                                  (search-input-directory %build-inputs
+                                                          "include/bash")))))
     (native-inputs
-     ;; XXX Without labels, the default 'configure phase picks the wrong "bash".
-     `(("bc" ,bc)
-       ("bash:include" ,bash "include")
-       ("check" ,check-0.14)
-       ("pkg-config" ,pkg-config)))
+     (list bc check-0.14 pkg-config))
     (inputs
      ;; TODO: Add more optional inputs.
-     (list curl
+     (list bash                         ; /bin/bash for native compilation
+           `(,bash "include")
+           curl
            libgcrypt
            `(,util-linux "lib")))
     (synopsis "Manipulate plain text files as databases")
-- 
2.36.1





  parent reply	other threads:[~2022-06-04  8:34 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-16 12:52 bug#55449: recutils cross-compilation "fix" breaks bash builtins Liliana Marie Prikler
2022-05-16 13:37 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix
2022-05-16 15:15 ` Maxime Devos
2022-06-04  8:30 ` Liliana Marie Prikler [this message]
2023-06-18  7:39   ` bug#55449: [PATCH] gnu: recutils: Use correct bash headers Liliana Marie Prikler

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=18b93bc799d759f48d0645f971104277f2a3b066.camel@gmail.com \
    --to=liliana.prikler@gmail.com \
    --cc=55449@debbugs.gnu.org \
    --cc=maximedevos@telenet.be \
    --cc=me@tobias.gr \
    /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).