From: Marius Bakke <mbakke@fastmail.com>
To: 30596@debbugs.gnu.org
Subject: [bug#30596] [PATCH 1/6] gnu: rocksdb: Update to 5.10.3.
Date: Sat, 24 Feb 2018 20:03:44 +0100 [thread overview]
Message-ID: <20180224190349.8155-1-mbakke@fastmail.com> (raw)
In-Reply-To: <20180224190122.8009-1-mbakke@fastmail.com>
* gnu/packages/databases.scm (rocksdb): Update to 5.10.3.
[arguments]: Set #:test-target. Add "USE_RTTI=1" to #:make-flags. Use INVOKE
instead of SYSTEM*. Replace 'check' phase and enable fixed test.
[license]: Update for changes in 5.5.4.
---
gnu/packages/databases.scm | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 29b6ca169..9f183b93e 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -17,7 +17,7 @@
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org>
-;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2016, 2017, 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org>
@@ -840,7 +840,7 @@ types are supported, as is encryption.")
(define-public rocksdb
(package
(name "rocksdb")
- (version "5.2.1")
+ (version "5.10.3")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/facebook/rocksdb"
@@ -848,7 +848,7 @@ types are supported, as is encryption.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1v2q05bl56sfp51m09z7g6489hkfq4vf6b4qgfg3d96ylgmay9yb"))
+ "0kx3mn2ifl9wfqg49msgzpvmr0x8mbhfglf78639xwrdyi2f90ya"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -858,6 +858,8 @@ types are supported, as is encryption.")
(build-system gnu-build-system)
(arguments
`(#:make-flags (list "CC=gcc"
+ ;; Ceph requires that RTTI is enabled.
+ "USE_RTTI=1"
(string-append "INSTALL_PATH="
(assoc-ref %outputs "out")))
;; Many tests fail on 32-bit platforms. There are multiple reports about
@@ -888,20 +890,28 @@ types are supported, as is encryption.")
(add-before 'check 'disable-failing-tests
(lambda _
(substitute* "Makefile"
- ;; This test fails with GCC-5 and is unmaintained.
- ;; https://github.com/facebook/rocksdb/issues/2148
- (("^[[:blank:]]+spatial_db_test[[:blank:]]+\\\\") "\\")
;; These tests reliably fail due to "Too many open files".
(("^[[:blank:]]+env_test[[:blank:]]+\\\\") "\\")
(("^[[:blank:]]+persistent_cache_test[[:blank:]]+\\\\") "\\"))
#t))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ ;; Running the full test suite takes hours and require
+ ;; a lot of disk space. Instead we only run a subset
+ ;; like the CI runners (see .travis.yml).
+ (if tests?
+ (invoke "make" "V=1" "ROCKSDBTESTS_END=db_block_cache_test"
+ "CC=gcc" "-j" (number->string (parallel-job-count))
+ "all_but_some_tests" "check_some")
+ (display "no test, no problem!\n"))
+ #t))
(add-after 'check 'build-release-libraries
;; The default build target is a debug build for tests. The
;; install target depends on "shared_lib" and "static_lib"
;; targets for release builds so we build them here for clarity.
;; TODO: Add debug output.
(lambda* (#:key (make-flags '()) #:allow-other-keys)
- (zero? (apply system* "make" "shared_lib" make-flags)))))))
+ (apply invoke "make" "V=1" "shared_lib" make-flags))))))
(native-inputs
`(("parallel" ,parallel)
("perl" ,perl)
@@ -925,8 +935,9 @@ between @dfn{Write-Amplification-Factor} (WAF), @dfn{Read-Amplification-Factor}
(RAF) and @dfn{Space-Amplification-Factor} (SAF). It has multi-threaded
compactions, making it specially suitable for storing multiple terabytes of
data in a single database. RocksDB is partially based on @code{LevelDB}.")
- ;; RocksDB is BSD-3 and the JNI adapter is Apache 2.0.
- (license (list license:bsd-3 license:asl2.0))))
+ ;; RocksDB is dual licensed under GPL2 and ASL 2.0. Some header
+ ;; files carry the 3-clause BSD license.
+ (license (list license:gpl2 license:asl2.0 license:bsd-3))))
(define-public sparql-query
(package
--
2.16.2
next prev parent reply other threads:[~2018-02-24 19:05 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-24 19:01 [bug#30596] [PATCH 0/6] Update Ceph and dependencies Marius Bakke
2018-02-24 19:03 ` Marius Bakke [this message]
2018-02-24 19:03 ` [bug#30596] [PATCH 2/6] gnu: snappy: Update to 1.1.7 Marius Bakke
2018-03-03 21:32 ` Ludovic Courtès
2018-02-24 19:03 ` [bug#30596] [PATCH 3/6] gnu: java-snappy: " Marius Bakke
2018-03-03 21:32 ` Ludovic Courtès
2018-02-24 19:03 ` [bug#30596] [PATCH 4/6] gnu: Add boost@1.66.0 Marius Bakke
2018-03-03 21:33 ` Ludovic Courtès
2018-02-24 19:03 ` [bug#30596] [PATCH 5/6] gnu: Add cmake@3.11 Marius Bakke
2018-03-03 21:35 ` Ludovic Courtès
2018-03-04 16:58 ` Marius Bakke
2018-02-24 19:03 ` [bug#30596] [PATCH 6/6] gnu: ceph: Update to 12.2.3 Marius Bakke
2018-03-03 21:37 ` Ludovic Courtès
2018-03-04 16:59 ` bug#30596: " Marius Bakke
2018-03-03 21:31 ` [bug#30596] [PATCH 1/6] gnu: rocksdb: Update to 5.10.3 Ludovic Courtès
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180224190349.8155-1-mbakke@fastmail.com \
--to=mbakke@fastmail.com \
--cc=30596@debbugs.gnu.org \
/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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.