mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 13:58:15 -05:00
gnu: redis: Use gexps and streamline.
* gnu/packages/databases.scm (redis) [arguments]: Merge the use-correct-tclsh into the patch-paths phase. Use 'which' instead of assoc-ref. Move the #:make-flags argument before the #:phases one. Use cc-for-target as the value of the CC make flag. [native-inputs]: Move field below arguments.
This commit is contained in:
parent
458b791f35
commit
4413b09fa3
1 changed files with 30 additions and 35 deletions
|
@ -2455,42 +2455,37 @@ (define-public redis
|
|||
;; Delete bundled jemalloc, as the package will use the libc one
|
||||
'(begin (delete-file-recursively "deps/jemalloc")))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list pkg-config procps tcl which))
|
||||
(arguments
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(add-after 'unpack 'use-correct-tclsh
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "runtest"
|
||||
(("^TCLSH=.*")
|
||||
(string-append "TCLSH="
|
||||
(assoc-ref inputs "tcl")
|
||||
"/bin/tclsh")))))
|
||||
(add-after 'unpack 'patch-paths
|
||||
(lambda _
|
||||
(substitute* "tests/support/server.tcl"
|
||||
(("/usr/bin/env")
|
||||
(which "env")))))
|
||||
(add-after 'unpack 'adjust-tests
|
||||
(lambda _
|
||||
;; Disable failing tests
|
||||
(substitute* "tests/test_helper.tcl"
|
||||
;; The AOF tests cause the test suite to hang waiting for a
|
||||
;; "background AOF rewrite to finish", perhaps because dead
|
||||
;; processes persist as zombies in the build environment.
|
||||
(("unit/aofrw") "")
|
||||
(("integration/aof(-multi-part)?") "")
|
||||
(("integration/failover") "")
|
||||
(("integration/replication-4") "")
|
||||
(("integration/replication-psync") "")
|
||||
(("integration/replication[^-]") "")))))
|
||||
#:make-flags `("CC=gcc"
|
||||
"MALLOC=libc"
|
||||
"LDFLAGS=-ldl"
|
||||
,(string-append "PREFIX="
|
||||
(assoc-ref %outputs "out")))))
|
||||
(list
|
||||
#:make-flags #~(list #$(string-append "CC=" (cc-for-target))
|
||||
"MALLOC=libc"
|
||||
"LDFLAGS=-ldl"
|
||||
(string-append "PREFIX=" #$output))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(add-after 'unpack 'patch-paths
|
||||
(lambda _
|
||||
(substitute* "runtest"
|
||||
(("^TCLSH=.*")
|
||||
(string-append "TCLSH=" (which "tclsh"))))
|
||||
(substitute* "tests/support/server.tcl"
|
||||
(("/usr/bin/env")
|
||||
(which "env")))))
|
||||
(add-after 'unpack 'adjust-tests
|
||||
(lambda _
|
||||
;; Disable failing tests
|
||||
(substitute* "tests/test_helper.tcl"
|
||||
;; The AOF tests cause the test suite to hang waiting for a
|
||||
;; "background AOF rewrite to finish", perhaps because dead
|
||||
;; processes persist as zombies in the build environment.
|
||||
(("unit/aofrw") "")
|
||||
(("integration/aof(-multi-part)?") "")
|
||||
(("integration/failover") "")
|
||||
(("integration/replication-4") "")
|
||||
(("integration/replication-psync") "")
|
||||
(("integration/replication[^-]") "")))))))
|
||||
(native-inputs (list pkg-config procps tcl which))
|
||||
(synopsis "Key-value cache and store")
|
||||
(description "Redis is an advanced key-value cache and store. Redis
|
||||
supports many data structures including strings, hashes, lists, sets, sorted
|
||||
|
|
Loading…
Reference in a new issue