From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epf86-0005ba-QG for guix-patches@gnu.org; Sat, 24 Feb 2018 14:05:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1epf82-00020w-RK for guix-patches@gnu.org; Sat, 24 Feb 2018 14:05:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:51123) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1epf82-00020p-N0 for guix-patches@gnu.org; Sat, 24 Feb 2018 14:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1epf82-0003cC-DL for guix-patches@gnu.org; Sat, 24 Feb 2018 14:05:02 -0500 Subject: [bug#30596] [PATCH 1/6] gnu: rocksdb: Update to 5.10.3. References: <20180224190122.8009-1-mbakke@fastmail.com> In-Reply-To: <20180224190122.8009-1-mbakke@fastmail.com> Resent-Message-ID: From: Marius Bakke Date: Sat, 24 Feb 2018 20:03:44 +0100 Message-Id: <20180224190349.8155-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30596@debbugs.gnu.org * 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 ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016 Danny Milosavljevic -;;; Copyright © 2016, 2017 Marius Bakke +;;; Copyright © 2016, 2017, 2018 Marius Bakke ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Jelle Licht @@ -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