[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: gnu: recutils: Adjust to Bash 4.4.
|
From: |
Ludovic Courtès |
|
Subject: |
01/03: gnu: recutils: Adjust to Bash 4.4. |
|
Date: |
Mon, 17 Oct 2016 20:07:22 +0000 (UTC) |
civodul pushed a commit to branch core-updates
in repository guix.
commit c21af659b4e6871b9576278cd5745881c696fd70
Author: Ludovic Courtès <address@hidden>
Date: Mon Oct 17 21:36:25 2016 +0200
gnu: recutils: Adjust to Bash 4.4.
* gnu/packages/databases.scm (recutils)[arguments]: Add
'set-bash4.4-header-location' phase.
---
gnu/packages/databases.scm | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index b7bd1f0..5219766 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -405,7 +405,24 @@ pictures, sounds, or video.")
#:configure-flags
(list (string-append "--with-bash-headers="
(assoc-ref %build-inputs "bash:include")
- "/include/bash"))))
+ "/include/bash"))
+
+ #:phases (modify-phases %standard-phases
+ (add-before 'build 'set-bash4.4-header-location
+ (lambda _
+ (substitute* "bash/Makefile.in"
+ ;; Adjust the header search path for Bash
+ ;; 4.4 in accordance with 'bash.pc'.
+ (("AM_CPPFLAGS = (.*)$" _ rest)
+ (string-append "AM_CPPFLAGS = "
+ "-I$(BASH_HEADERS)/include "
+ rest))
+
+ ;; Install to PREFIX/lib/bash to match Bash
+ ;; 4.4's search path.
+ (("^libdir = .*$")
+ "libdir = @libdir@/bash\n"))
+ #t)))))
(native-inputs `(("emacs" ,emacs-minimal)
("bc" ,bc)