gnu: recutils: Update to 1.8.
* gnu/packages/databases.scm (recutils): Update to 1.8. [source]: Remove snippet. [arguments]: Remove custom 'set-bash4.4-header-location phase. Enable parallel tests. [inputs]: Move check ... [native-inputs]: ... to here. Add pkg-config.
This commit is contained in:
parent
30e06c2cee
commit
c007e35d24
|
@ -10,7 +10,7 @@
|
||||||
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
|
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
|
||||||
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||||
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
|
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
|
||||||
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
|
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is>
|
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is>
|
||||||
;;; Copyright © 2016, 2017, 2018 Roel Janssen <roel@gnu.org>
|
;;; Copyright © 2016, 2017, 2018 Roel Janssen <roel@gnu.org>
|
||||||
;;; Copyright © 2016 David Craven <david@craven.ch>
|
;;; Copyright © 2016 David Craven <david@craven.ch>
|
||||||
|
@ -916,66 +916,31 @@ organized in a hash table or B+ tree.")
|
||||||
(define-public recutils
|
(define-public recutils
|
||||||
(package
|
(package
|
||||||
(name "recutils")
|
(name "recutils")
|
||||||
(version "1.7")
|
(version "1.8")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnu/recutils/recutils-"
|
(uri (string-append "mirror://gnu/recutils/recutils-"
|
||||||
version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0cdwa4094x3yx7vn98xykvnlp9rngvd58d19vs3vh5hrvggccg93"))
|
"14xiln4immfsw8isnvwvq0h23f6z0wilpgsc4qzabnrzb5lsx3nz"))))
|
||||||
(modules '((guix build utils)))
|
|
||||||
(snippet
|
|
||||||
'(begin
|
|
||||||
;; Adjust the bundled gnulib to work with glibc 2.28. See e.g.
|
|
||||||
;; "m4-gnulib-libio.patch". This is a phase rather than patch
|
|
||||||
;; or snippet to work around <https://bugs.gnu.org/32347>.
|
|
||||||
(substitute* (find-files "lib" "\\.c$")
|
|
||||||
(("#if defined _IO_ftrylockfile")
|
|
||||||
"#if defined _IO_EOF_SEEN"))
|
|
||||||
(substitute* "lib/stdio-impl.h"
|
|
||||||
(("^/\\* BSD stdio derived implementations")
|
|
||||||
(string-append "#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN\n"
|
|
||||||
"# define _IO_IN_BACKUP 0x100\n"
|
|
||||||
"#endif\n\n"
|
|
||||||
"/* BSD stdio derived implementations")))
|
|
||||||
#t))))
|
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
|
|
||||||
;; Running tests in parallel leads to test failures and crashes in
|
(arguments '(#:configure-flags
|
||||||
;; torture/utils.
|
|
||||||
(arguments '(#:parallel-tests? #f
|
|
||||||
#:configure-flags
|
|
||||||
(list (string-append "--with-bash-headers="
|
(list (string-append "--with-bash-headers="
|
||||||
(assoc-ref %build-inputs "bash:include")
|
(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)
|
(native-inputs `(("emacs" ,emacs-minimal)
|
||||||
("bc" ,bc)
|
("bc" ,bc)
|
||||||
("bash:include" ,bash "include")
|
("bash:include" ,bash "include")
|
||||||
("libuuid" ,util-linux)))
|
("check" ,check)
|
||||||
|
("libuuid" ,util-linux)
|
||||||
|
("pkg-config" ,pkg-config)))
|
||||||
|
|
||||||
;; TODO: Add more optional inputs.
|
;; TODO: Add more optional inputs.
|
||||||
(inputs `(("curl" ,curl)
|
(inputs `(("curl" ,curl)
|
||||||
("libgcrypt" ,libgcrypt)
|
("libgcrypt" ,libgcrypt)))
|
||||||
("check" ,check)))
|
|
||||||
(synopsis "Manipulate plain text files as databases")
|
(synopsis "Manipulate plain text files as databases")
|
||||||
(description
|
(description
|
||||||
"GNU Recutils is a set of tools and libraries for creating and
|
"GNU Recutils is a set of tools and libraries for creating and
|
||||||
|
|
Loading…
Reference in New Issue