guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/03: gnu: recutils: Build the Bash builtin, readrec.


From: Ludovic Courtès
Subject: 03/03: gnu: recutils: Build the Bash builtin, readrec.
Date: Wed, 21 Oct 2015 19:20:16 +0000

civodul pushed a commit to branch core-updates
in repository guix.

commit b747a9db1ebcd6383a2555f5acb933fcd204a81c
Author: Leo Famulari <address@hidden>
Date:   Sun Oct 18 15:40:08 2015 -0400

    gnu: recutils: Build the Bash builtin, readrec.
    
    * gnu/packages/databases.scm (recutils)[native-inputs]: Add bash:include.
      [arguments]: Add configure-flag with path to headers provided by
      bash:include.
    
    Signed-off-by: Ludovic Courtès <address@hidden>
---
 gnu/packages/databases.scm |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index a174241..7e669d6 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
 ;;; Copyright © 2015 Eric Bavier <address@hidden>
 ;;; Copyright © 2015 Sou Bunnbu <address@hidden>
+;;; Copyright © 2015 Leo Famulari <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24,6 +25,7 @@
 
 (define-module (gnu packages databases)
   #:use-module (gnu packages)
+  #:use-module (gnu packages bash)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages language)
   #:use-module (gnu packages linux)
@@ -286,16 +288,18 @@ pictures, sounds, or video.")
 
     ;; Running tests in parallel leads to test failures and crashes in
     ;; torture/utils.
-    (arguments '(#:parallel-tests? #f))
+    (arguments '(#:parallel-tests? #f
+                 #:configure-flags
+                 (list (string-append "--with-bash-headers="
+                                      (assoc-ref %build-inputs "bash:include")
+                                      "/include/bash"))))
 
     (native-inputs `(("emacs" ,emacs-no-x)
                      ("bc" ,bc)
+                     ("bash:include" ,bash "include")
                      ("libuuid", util-linux)))
 
     ;; TODO: Add more optional inputs.
-    ;; FIXME: Our Bash doesn't have development headers (need for the 'readrec'
-    ;; built-in command), but it's not clear how to get them installed.
-    ;; See <https://lists.gnu.org/archive/html/bug-bash/2014-03/msg00125.html>.
     (inputs `(("curl" ,curl)
               ("libgcrypt" ,libgcrypt)
               ("check" ,check)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]