From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 24 14:02:00 2018 Received: (at submit) by debbugs.gnu.org; 24 Feb 2018 19:02:00 +0000 Received: from localhost ([127.0.0.1]:58988 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epf55-0003WQ-P4 for submit@debbugs.gnu.org; Sat, 24 Feb 2018 14:01:59 -0500 Received: from eggs.gnu.org ([208.118.235.92]:60877) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epf50-0003W8-9P for submit@debbugs.gnu.org; Sat, 24 Feb 2018 14:01:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1epf4u-0007PS-5w for submit@debbugs.gnu.org; Sat, 24 Feb 2018 14:01:49 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:40929) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1epf4u-0007P7-2C for submit@debbugs.gnu.org; Sat, 24 Feb 2018 14:01:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51830) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epf4q-0004yP-M1 for guix-patches@gnu.org; Sat, 24 Feb 2018 14:01:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1epf4l-0007G0-Qw for guix-patches@gnu.org; Sat, 24 Feb 2018 14:01:44 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:58311) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1epf4l-0007Cw-Lf for guix-patches@gnu.org; Sat, 24 Feb 2018 14:01:39 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 3306A20C1B; Sat, 24 Feb 2018 14:01:36 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sat, 24 Feb 2018 14:01:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:message-id:subject:to:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; bh=sey+9uX2lRRSBe+9eWqktKb50cwV+VY3K3EjI6mO2 8E=; b=IlIEBLEzPZeWisxbGMZ3DFFRCmQMQjpNOTiA3yCMqSJQoesfMCQZ/Nhi/ 8g/FOTIkCx9Ii5z+i20upJZ7WaLdoPdLUO5KwIAbXMYVHqNmxLkv3YoS/KCZ7mmx nzQPqGkmS9CqNOtQ/Ikib7xnfaGmooYnKYQDOdl8lKyy5nrTBhGvwUcz15GAxv2l bf1zYtTTedy9j5Y42Dob+wpfb2sS+AnlbAxNN281CzJc7dBB7VdyHmtwIVtsJQor L2hgBEcLul5EgaPlmicQOM4p8QdtWNmRAKyQ4Vw7y1xUO2z80637+F+wJS0U87Xx PeLULCnrKyIao9Mkfq1iK3PvZ2JnQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=sey+9uX2lRRSBe+9e WqktKb50cwV+VY3K3EjI6mO28E=; b=V2PUZDN2/0yHjGAMT71nKDhzZRm+7iIxD MMR3nM54W/dPgLjom/x+g9OUyN1QIObjErMW5ljqAcWy5KU3fXK/g2f5zwyg/pjz DYod/X04QWVRdbXjOYdLbCImGsnqkU9jkdoMlhLssNvfD3Q0RzdkzLTcAh17znon 5WzohUH9wYLnYJ6CxbFu4ClrCFqcmuqIff86F9+qcvEAih6B8mUt/eh1IzhwHvBr 1f4IVJ+parOXwamF0VNVjLV8cXQ93Nf6w5n2ZGOx8adjVlQvmyQR/5mt4frzCyvn jAjvRBp4O46dpJroNMb/EghM4nHdFvKPtFrLDNbFYK8R1Rk+oXqVQ== X-ME-Sender: Received: from localhost (cm-84.214.173.174.getinternet.no [84.214.173.174]) by mail.messagingengine.com (Postfix) with ESMTPA id B518D24575; Sat, 24 Feb 2018 14:01:35 -0500 (EST) From: Marius Bakke To: guix-patches@gnu.org Subject: [PATCH 0/6] Update Ceph and dependencies Date: Sat, 24 Feb 2018 20:01:22 +0100 Message-Id: <20180224190122.8009-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.16.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.4 (----) X-Debbugs-Envelope-To: submit Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.4 (----) This series updates Ceph to the latest LTS release. It requires Boost 1.66(!), which in turn requires a CMake 3.11 release candidate for "FindBoost.cmake" to work properly(!!). I ran out of disk space when running the full RocksDB test suite, so I adapted the check phase to only run a subset of the tests (approx 25%). It also updates Snappy, since RocksDB now works with the latest version. Marius Bakke (6): gnu: rocksdb: Update to 5.10.3. gnu: snappy: Update to 1.1.7. gnu: java-snappy: Update to 1.1.7. gnu: Add boost@1.66.0. gnu: Add cmake@3.11. gnu: ceph: Update to 12.2.3. gnu/local.mk | 3 +- gnu/packages/boost.scm | 14 +++++ gnu/packages/cmake.scm | 63 +++++++++++++++++++++ gnu/packages/compression.scm | 43 +++++++++------ gnu/packages/databases.scm | 29 +++++++--- .../patches/ceph-disable-cpu-optimizations.patch | 64 +++++++++------------- .../patches/ceph-disable-unittest-throttle.patch | 52 ------------------ gnu/packages/patches/ceph-rocksdb-compat.patch | 63 +++++++++++++++++++++ gnu/packages/patches/cmake-3.11-pthread-fix.patch | 30 ++++++++++ gnu/packages/storage.scm | 33 ++++++----- 10 files changed, 264 insertions(+), 130 deletions(-) delete mode 100644 gnu/packages/patches/ceph-disable-unittest-throttle.patch create mode 100644 gnu/packages/patches/ceph-rocksdb-compat.patch create mode 100644 gnu/packages/patches/cmake-3.11-pthread-fix.patch -- 2.16.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 24 14:04:06 2018 Received: (at 30596) by debbugs.gnu.org; 24 Feb 2018 19:04:06 +0000 Received: from localhost ([127.0.0.1]:58995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epf72-0003ZX-6w for submit@debbugs.gnu.org; Sat, 24 Feb 2018 14:04:06 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:60103) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epf70-0003ZQ-FB for 30596@debbugs.gnu.org; Sat, 24 Feb 2018 14:03:59 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 3994820A11; Sat, 24 Feb 2018 14:03:58 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sat, 24 Feb 2018 14:03:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=sMbE6lrweTMueVVBS950sLLaHpxIhI0VsChNgDjT5jY=; b=Bfr9AcdN 59dDBT4f8y5Lh6nmGNbzcgJ3PZ7qIRu3FkMnU7gwoqeIVld+qZVi3Jof0GQnTe0h MWRss2UzGHwDdj0MZFwrnpWnSP7643XnU2B7N0gF1RBi0lcfgprbnvWJDGW9+cMx lFTGHqwUDJ1y7wdmveHrMCyuxwDmXTlgZJF9JQ13uwHrPF6uI/Z1oIriQ5Ms/TbJ 9ylc7QjfV+DNw99JBNOs1WxM75S4n9Marnht5OKKV9jB19rBYIvBo6YYI89Xd6Ek nz8Bzghlm8vj2KBrsxvb8sDTs6vOa+MppQGY3eI9KDqq00kPmVOlovmccU/NO6J5 Be8M1Y83d89HHg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=sMbE6lrweTMueVVBS950sLLaHpxIh I0VsChNgDjT5jY=; b=UmUq0Q37zY3kUf9/IEQXA6tUicwucpcH9vO0JundKcm25 2k0jWPDcTJc084EaqYzalp9lnPrUOf1hhM6gAetOXz7hNyWi7Uc/23i+VQ9XqSVr 3are/FJFaU6Tb5HJcr/TN/McxBwKl0z1POSWEgWZMBXu039WDI4IlxhjS5iWq/Wx Bmcbz/Jdu8Lip6ebGSJG0Qi9+DPTim1n8NVM8DX4OCpg2Vlrk5KbjEA8cX7snW3t m3i9wPcX71eOKxDe0D/k4R68VHRoIAPFa21j7pMM+WOvjFbDVpCm89arN1AzdCTP EzFshDI1b0KRNo66xRUjSz4LnnQWM7rWxDG8hvxXQ== X-ME-Sender: Received: from localhost (cm-84.214.173.174.getinternet.no [84.214.173.174]) by mail.messagingengine.com (Postfix) with ESMTPA id B55F724805; Sat, 24 Feb 2018 14:03:57 -0500 (EST) From: Marius Bakke To: 30596@debbugs.gnu.org Subject: [PATCH 1/6] gnu: rocksdb: Update to 5.10.3. Date: Sat, 24 Feb 2018 20:03:44 +0100 Message-Id: <20180224190349.8155-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.16.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 30596 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) * 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 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 24 14:04:06 2018 Received: (at 30596) by debbugs.gnu.org; 24 Feb 2018 19:04:06 +0000 Received: from localhost ([127.0.0.1]:59006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epf78-0003aE-Cj for submit@debbugs.gnu.org; Sat, 24 Feb 2018 14:04:06 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:56507) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epf73-0003Za-Lh for 30596@debbugs.gnu.org; Sat, 24 Feb 2018 14:04:01 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 92E3220B88; Sat, 24 Feb 2018 14:04:01 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sat, 24 Feb 2018 14:04:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=vxATwK4qjkle3kIuo Xg8nP+fwoGZR6hL7O6o3n+3kn4=; b=NqYJfgoP+xsw4pG1ULZQgbw6/lA0GZGjZ W9DX7kKLcFxrjBQFVJ3Vlk9w3cqG+wzQMXi09MWSLrNpLdGzVNmHVRHxoCyko2ZM bAUGlmVeelWOhaxFKRagLQJiVwcZE5jq18I3SwUPCH0GNoyTCG5ya4xj15VPVoeT jo4B9FQUN67US+W7ClDVzwcL281zAtbPJ9+6pN+/h/7AvryRicgXFtOA+4R4hTSM TR0xAuG+Ndj+p3Wlyq5amfCLE20ZTohkFWFtRqEj2kMFYjklfrraDH6hpew4+XCK ngaKMvBjxWYoMuRMtYVStfxaNTp49RkooCa4084asrc8gQhIpev1Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=vxATwK4qjkle3kIuoXg8nP+fwoGZR6hL7O6o3n+3kn4=; b=CMoWpiRg kbsbkbdzE9QeYElJv6h3xeWfg2rj8HB0puFg5IfjvVGbCLS1inzBQqNuLZUoJqJ2 OgEYywQ1TvmHk3Y7KzzvANhZZd9c6x1g2jhgh7LGDbjsQQF8qEreyvpszFdpdvnz OTys321y2RlcSJw/lpwIJrZHCuiLdJITvIfvHBEeEjrYu27ESLbWHy4q2Bjci21E /BytQpQzUZ3mvtPvk7QXIvL29ANGAgY9/XdVsrTGUO7Qdk1C1hICgXsVFAklBeol /hOGU9ijXsxzQgcipJ/Tmd0qAZ7cTfk5t9UPeCkzrqITN5DjY6atB0hmRlpQlA2O WU9Uv7EJoLTcbw== X-ME-Sender: Received: from localhost (cm-84.214.173.174.getinternet.no [84.214.173.174]) by mail.messagingengine.com (Postfix) with ESMTPA id AC01B24513; Sat, 24 Feb 2018 14:04:00 -0500 (EST) From: Marius Bakke To: 30596@debbugs.gnu.org Subject: [PATCH 2/6] gnu: snappy: Update to 1.1.7. Date: Sat, 24 Feb 2018 20:03:45 +0100 Message-Id: <20180224190349.8155-2-mbakke@fastmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180224190349.8155-1-mbakke@fastmail.com> References: <20180224190349.8155-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 30596 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/compression.scm (snappy): Update to 1.1.7. [source]: Change to git archive. Set file-name. [build-system]: Change to CMAKE-BUILD-SYSTEM. [arguments]: Add #:configure-flags. [description]: Fix infractions. --- gnu/packages/compression.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index f25c4bba3..b7ae2b9ed 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1070,21 +1070,23 @@ algorithm within the Numpy framework.") (define-public snappy (package (name "snappy") - (version "1.1.3") + (version "1.1.7") (source (origin (method url-fetch) - (uri (string-append - "https://github.com/google/snappy/releases/download/" - version "/" name "-" version ".tar.gz")) + (uri (string-append "https://github.com/google/snappy/archive/" + version ".tar.gz")) + (file-name (string-append "snappy-" version ".tar.gz")) (sha256 (base32 - "1wzf8yif5ym2gj52db6v5m1pxnmn258i38x7llk9x346y2nq47ig")))) - (build-system gnu-build-system) + "1m7rcdqzkys5lspj8jcsaah8w33zh28s771bw0ga2lgzfgl05yix")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) (home-page "https://github.com/google/snappy") (synopsis "Fast compressor/decompressor") - (description "Snappy is a compression/decompression library. It does not + (description "Snappy is a compression/decompression library. It does not aim for maximum compression, or compatibility with any other compression library; -instead, it aims for very high speeds and reasonable compression. For instance, +instead, it aims for very high speeds and reasonable compression. For instance, compared to the fastest mode of zlib, Snappy is an order of magnitude faster for most inputs, but the resulting compressed files are anywhere from 20% to 100% bigger.") -- 2.16.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 24 14:04:07 2018 Received: (at 30596) by debbugs.gnu.org; 24 Feb 2018 19:04:07 +0000 Received: from localhost ([127.0.0.1]:59008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epf78-0003aL-Ob for submit@debbugs.gnu.org; Sat, 24 Feb 2018 14:04:07 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:48433) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epf75-0003Zy-NV for 30596@debbugs.gnu.org; Sat, 24 Feb 2018 14:04:03 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 9F41A20B88; Sat, 24 Feb 2018 14:04:03 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sat, 24 Feb 2018 14:04:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=W/Vh/AxeguXqAlp+W C9nVxbjhFcdW8uK4v1moaTaQ9g=; b=Dab5T4qXmfjlCzXfIiUGzLKWIH55Hdxbx w5YrsbP9LU6RBbu1V8jkRHLrGcHZrcQEd6Nb20V5pLLb7VSVZg5VFeu5mIdRqkXG ghJ5ACkbIJMRGBbgQfV4ziWxSOVKAJU+emzOtJTjSUdNZ3dYsKeREcq7CL3Xa5Fp 5gArVP/DB7JqAi5DN3FRCGKdD7txmFyS0rTtQO0REGP3E4TSpCubyf+yZcf6kF0C XTD8ap13C7TCan6k7FPZ7PcjGHdb1YPPwsGXz2j50G8aYrgxhIyWEmYj71JAeCk2 IjTMbGBVkwD/+KvKRKbLYPSv6yrYIQI45ZoYClwFf1ZsxPvCagSKg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=W/Vh/AxeguXqAlp+WC9nVxbjhFcdW8uK4v1moaTaQ9g=; b=QCz0Nk3Y FZBEjr+imOoDb9gKQXx/ZQZAoTzUq+146GMNN4/iuv9E10wU/9KLtbKc0C6b1cSK eDZTTHVu9rBOeG7NVxnMzZIrpldykS/3CDPS4HkAz/MK7kLO2xLDQEvBaK1V6cvA SAu6SA6sprw7SI857MK43NfT6wsn7bZcfPCeJD1PpA5Kt1ujadxiELH/uUyWtYpi FffzzQ9sYjjRIelgdKiq19NGD5ArntVi8UIXIdfCKxTW1BNVr7JhZezX6drZoRYD RZAat3S8efhrrjcq1x9MSPSMJsATWNya1BbP/AFfxKxSFaZw3pdVM3SJjABzUI+f O0CCRnBokI5h5g== X-ME-Sender: Received: from localhost (cm-84.214.173.174.getinternet.no [84.214.173.174]) by mail.messagingengine.com (Postfix) with ESMTPA id 30A6E24513; Sat, 24 Feb 2018 14:04:03 -0500 (EST) From: Marius Bakke To: 30596@debbugs.gnu.org Subject: [PATCH 3/6] gnu: java-snappy: Update to 1.1.7. Date: Sat, 24 Feb 2018 20:03:46 +0100 Message-Id: <20180224190349.8155-3-mbakke@fastmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180224190349.8155-1-mbakke@fastmail.com> References: <20180224190349.8155-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 30596 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/compression.scm (java-snappy): Update to 1.1.7. [arguments]: Use INVOKE instead of SYSTEM*. Avoid CMAKE dependency. Delete Hadoop test. Enable fixed test. [native-inputs]: Add JAVA-COMMONS-LANG and JAVA-COMMONS-IO. --- gnu/packages/compression.scm | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index b7ae2b9ed..4e067c2a5 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1132,7 +1132,7 @@ install: libbitshuffle.so (define-public java-snappy (package (name "java-snappy") - (version "1.1.4") + (version "1.1.7") (source (origin (method url-fetch) (uri (string-append "https://github.com/xerial/snappy-java/archive/" @@ -1140,7 +1140,7 @@ install: libbitshuffle.so (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1w58diryma7qz7aa24yv8shf3flxcbbw8jgcn2lih14wgmww58ww")))) + "0q4kxz2n97czf6g5gzq0d8yz22cgiaj7wp51rzsswh3bi99bpgg5")))) (build-system ant-build-system) (arguments `(#:jar-name "snappy.jar" @@ -1180,7 +1180,9 @@ install: libbitshuffle.so (("NAME\\): \\$\\(SNAPPY_OBJ\\)") "NAME): $(SNAPPY_OBJ)\n\t@mkdir -p $(@D)")) ;; Finally we can run the Makefile to build the dynamic library. - (zero? (system* "make" "native")))) + ;; Use the -nocmake target to avoid a dependency on cmake, + ;; which in turn requires the "git_unpacked" directory. + (invoke "make" "native-nocmake"))) ;; Once we have built the shared library, we need to place it in the ;; "build" directory so it can be added to the jar file. (add-after 'build-jni 'copy-jni @@ -1189,13 +1191,14 @@ install: libbitshuffle.so "build/classes/org/xerial/snappy/native"))) (add-before 'check 'fix-failing (lambda _ - ;; This package assumes maven build, which puts results in "target". - ;; We put them in "build" instead, so fix that. - (substitute* "src/test/java/org/xerial/snappy/SnappyLoaderTest.java" - (("target/classes") "build/classes")) - ;; FIXME: probably an error - (substitute* "src/test/java/org/xerial/snappy/SnappyOutputStreamTest.java" - (("91080") "91013"))))))) + (with-directory-excursion "src/test/java/org/xerial/snappy" + ;; This package assumes maven build, which puts results in "target". + ;; We put them in "build" instead, so fix that. + (substitute* "SnappyLoaderTest.java" + (("target/classes") "build/classes")) + ;; This requires Hadoop, which is not in Guix yet. + (delete-file "SnappyHadoopCompatibleOutputStreamTest.java")) + #t))))) (inputs `(("osgi-framework" ,java-osgi-framework))) (propagated-inputs @@ -1206,6 +1209,8 @@ install: libbitshuffle.so ("hamcrest" ,java-hamcrest-core) ("xerial-core" ,java-xerial-core) ("classworlds" ,java-plexus-classworlds) + ("commons-lang" ,java-commons-lang) + ("commons-io" ,java-commons-io) ("perl" ,perl))) (home-page "https://github.com/xerial/snappy-java") (synopsis "Compression/decompression algorithm in Java") -- 2.16.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 24 14:04:09 2018 Received: (at 30596) by debbugs.gnu.org; 24 Feb 2018 19:04:09 +0000 Received: from localhost ([127.0.0.1]:59016 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epf7B-0003ab-5J for submit@debbugs.gnu.org; Sat, 24 Feb 2018 14:04:09 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:33883) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epf77-0003a6-C0 for 30596@debbugs.gnu.org; Sat, 24 Feb 2018 14:04:05 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 3DF7B20C2A; Sat, 24 Feb 2018 14:04:05 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sat, 24 Feb 2018 14:04:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=NV3qZuQ7I8JCvIy81 zy6Jp9xopc8FjW1rk2+OP4qJiQ=; b=OGQJiOfqkCE/a7DhNn1AnSMvIHNQpqnFm T+X5m2pcur5BcGo0FMliu6X8axWXCAzM6buk44zRHDNFTWJujFwF9sh9hZyEF/W5 fkUS3YtwVg/YNyHRh8z6jQaZsXPfQUQEsoYKHXmdRDjfiUeI58WpVKPp9vpIcDFT Sf/qF0OaWXPpMHV/XPmtYlKYaqAcCtVx+3pv6tVbWjduszNuyq+7rcPNv/H+5yWg /CJU10LZW2738ZI8pE4hzp0hTL/u6xP+l27vSzRRDOlAnJGuvY7tNAULygBHoHkr YJk5uomu43MOF10g+r1ZCV44zM8uOEaPLpT25dEpvd/qn5i5vdqMg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=NV3qZuQ7I8JCvIy81zy6Jp9xopc8FjW1rk2+OP4qJiQ=; b=GpAn6ad+ p0a7E/mzCN/kWZ3Q7jJBLmlftTZYwfq9nwuWJAbSjz/yQjMu6Ppox4D19nRR4Glw 7JBD9GoGDm6V8xcRRDhkkr80vBY8sjdYjvMUE6qPrKWPP/xTJQ/14Qv95KqDFf3X H7LmI0W0R6e/dd2KW5Xeic1JtRrPYZHeDpXEKmlEuVmPcQES7Pu26aJc7DHcYTpx u8Jk+4x0ouogPff/pjL6Pxwhpgu73CZT/wpX9nBvjrPk1vDauAECDM26/yhvJm8/ QoYOolr+PVSH56aIUXgcHlwr2/pvbqu1d4a/SQOZSFoVYRb50hOB9HyG3p3SRrbO aCzzTQAOL2pzzw== X-ME-Sender: Received: from localhost (cm-84.214.173.174.getinternet.no [84.214.173.174]) by mail.messagingengine.com (Postfix) with ESMTPA id C2B4D24513; Sat, 24 Feb 2018 14:04:04 -0500 (EST) From: Marius Bakke To: 30596@debbugs.gnu.org Subject: [PATCH 4/6] gnu: Add boost@1.66.0. Date: Sat, 24 Feb 2018 20:03:47 +0100 Message-Id: <20180224190349.8155-4-mbakke@fastmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180224190349.8155-1-mbakke@fastmail.com> References: <20180224190349.8155-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 30596 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/boost.scm (boost-1.66): New public variable. --- gnu/packages/boost.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 91dd2f915..f4ba82810 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -110,6 +110,20 @@ across a broad spectrum of applications.") (license (license:x11-style "http://www.boost.org/LICENSE_1_0.txt" "Some components have other similar licences.")))) +(define-public boost-1.66 + (package + (inherit boost) + (version "1.66.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/boost/boost/" version "/boost_" + (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version) + ".tar.bz2")) + (sha256 + (base32 + "1aaw48cmimsskzgiclwn0iifp62a5iw9cbqrhfari876af1828ap")))))) + (define-public mdds (package (name "mdds") -- 2.16.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 24 14:04:15 2018 Received: (at 30596) by debbugs.gnu.org; 24 Feb 2018 19:04:15 +0000 Received: from localhost ([127.0.0.1]:59018 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epf7D-0003ax-LM for submit@debbugs.gnu.org; Sat, 24 Feb 2018 14:04:15 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:37025) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epf78-0003aR-UV for 30596@debbugs.gnu.org; Sat, 24 Feb 2018 14:04:09 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id D430D20A90; Sat, 24 Feb 2018 14:04:06 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sat, 24 Feb 2018 14:04:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=rzAwZXUTXF6PGsMw+ 8WNHUk2aZ+mqmPsJOaatBmzSCk=; b=fzWwgXBQEkHhX6A3RvyvF3aJzFkRo+69x f3HRSVLVeJgp+6rzaeoqsDdYgBteiHAJrUVBLb2qCK1/+IaG4WKmEINgIYAxAX8M 7lwGlTHxZJyz3AQe7qJxhi9d0o28b8u3JhEON53fdZO+VhTaWV/V3JMO7qz2sCeo 73V7a73q6IpA//ou5+duW+0/AqjBMs1D2MrCWlQrbNQtMxa2p0q8hD7qI/huxRq1 7mvojw58TDiB0Cr19W1AxvnHYvuYdMg2Mqlcrpqv/2AiImgK/l2JviBJOBZIURNi bN8vBYJEu7Lf/y/pIssGtw2flK9vzcKD1rYVhAAarmlQrmComS0aw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=rzAwZXUTXF6PGsMw+8WNHUk2aZ+mqmPsJOaatBmzSCk=; b=S48aKMEv 2aSOT703RPLZugT54ANwyCZbq4CcR94x0ifRFFarXyjsE4vwpzSI1DD/vNf+uU/P Crr8zf2+/w0/RjyTyrWj6RH0jiTEwf0/hcvPyMGh6a7ouqblTpBFWr3rtd/WoiZb KedSqJc+hEC5TbpwmV4qQOqowTG+ySfxySOHzacmWeIsOG+IrhHDA58oWfFWs8Ws gKfXdQl2btv50rRS7J1QPeo7BSE847V/ItSUSxaQe3l13o5PZlQhJIHNjaM8/HMK cB87vlcfEAxGa6iXwE/P9xOvBXAy3Ccb0ZAcjcJoSFTT08kJLIMOoAti3UZvJRl7 vWpo8Nwib02TuA== X-ME-Sender: Received: from localhost (cm-84.214.173.174.getinternet.no [84.214.173.174]) by mail.messagingengine.com (Postfix) with ESMTPA id 5B70E24513; Sat, 24 Feb 2018 14:04:06 -0500 (EST) From: Marius Bakke To: 30596@debbugs.gnu.org Subject: [PATCH 5/6] gnu: Add cmake@3.11. Date: Sat, 24 Feb 2018 20:03:48 +0100 Message-Id: <20180224190349.8155-5-mbakke@fastmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180224190349.8155-1-mbakke@fastmail.com> References: <20180224190349.8155-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 30596 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/patches/cmake-3.11-pthread-fix.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/cmake.scm (cmake-3.11): New public variable. --- gnu/local.mk | 1 + gnu/packages/cmake.scm | 63 +++++++++++++++++++++++ gnu/packages/patches/cmake-3.11-pthread-fix.patch | 30 +++++++++++ 3 files changed, 94 insertions(+) create mode 100644 gnu/packages/patches/cmake-3.11-pthread-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index a10f3150e..75f275928 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -591,6 +591,7 @@ dist_patch_DATA = \ %D%/packages/patches/clucene-pkgconfig.patch \ %D%/packages/patches/clx-remove-demo.patch \ %D%/packages/patches/cmake-fix-tests.patch \ + %D%/packages/patches/cmake-3.11-pthread-fix.patch \ %D%/packages/patches/coda-use-system-libs.patch \ %D%/packages/patches/cool-retro-term-dont-check-uninit-member.patch \ %D%/packages/patches/cool-retro-term-fix-array-size.patch \ diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index a4e2d38e3..801323c72 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -31,6 +31,7 @@ #:use-module (gnu packages) #:use-module (gnu packages backup) #:use-module (gnu packages compression) + #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages file) #:use-module (gnu packages libevent) @@ -149,3 +150,65 @@ and workspaces that can be used in the compiler environment of your choice.") license:bsd-2 ; cmlibarchive license:expat ; cmjsoncpp is dual MIT/public domain license:public-domain)))) ; cmlibarchive/archive_getdate.c + +;; Recent Ceph requires Boost 1.66, which in turn requires CMake 3.11 for +;; its updated "FindBoost.cmake" facility. +(define-public cmake-3.11 + (package + (inherit cmake) + (version "3.11.0-rc1") + (source (origin + (inherit (package-source cmake)) + (uri (string-append "https://www.cmake.org/files/v" + (version-major+minor version) + "/cmake-" version ".tar.gz")) + (sha256 + (base32 + "0yz79h2yvqyhyzhr889mfadqq20am5g1z0aqz22kdia9jnxwl13g")) + (patches (append (origin-patches (package-source cmake)) + (search-patches "cmake-3.11-pthread-fix.patch"))) + (snippet + '(begin + ;; Drop bundled software. + (with-directory-excursion "Utilities" + (for-each delete-file-recursively + '("cmbzip2" + "cmcurl" + "cmexpat" + "cmliblzma" + "cmzlib")) + #t))))) + (build-system gnu-build-system) + (arguments + `(,@(substitute-keyword-arguments (package-arguments cmake) + ((#:phases phases) + `(modify-phases ,phases + (replace 'patch-bin-sh + (lambda _ + ;; Replace "/bin/sh" by the right path in... a lot of + ;; files. + (substitute* + '("Modules/CompilerId/Xcode-3.pbxproj.in" + "Modules/CPack.RuntimeScript.in" + "Source/cmakexbuild.cxx" + "Source/cmGlobalXCodeGenerator.cxx" + "Source/cmLocalUnixMakefileGenerator3.cxx" + "Source/cmExecProgramCommand.cxx" + "Utilities/Release/release_cmake.cmake" + "Utilities/cmlibarchive/libarchive/archive_write_set_format_shar.c" + "Tests/CMakeLists.txt" + "Tests/RunCMake/File_Generate/RunCMakeTest.cmake") + (("/bin/sh") (which "sh"))) + #t)) + ;; Parallel tests are unsupported in newer releases. + (delete 'set-test-environment) + (add-before 'check 'disable-broken-test + (lambda _ + ;; This test is broken with SOURCE_DATE_EPOCH since CMake 3.8. + ;; https://gitlab.kitware.com/cmake/cmake/issues/17762 + (substitute* "Tests/CMakeTests/StringTest.cmake.in" + ((".*TIMESTAMP-UnixTime.*") "\n")) + #t))))))) + (inputs + `(("rhash" ,rhash) + ,@(package-inputs cmake))))) diff --git a/gnu/packages/patches/cmake-3.11-pthread-fix.patch b/gnu/packages/patches/cmake-3.11-pthread-fix.patch new file mode 100644 index 000000000..4f5ae5add --- /dev/null +++ b/gnu/packages/patches/cmake-3.11-pthread-fix.patch @@ -0,0 +1,30 @@ +Fix pthread link failure when using system libuv. + +Copied from upstream source repository: +https://gitlab.kitware.com/cmake/cmake/commit/94eee5e683b80e0ffd8e0c4fd3a45b03f0f37b18 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e4d2a9a0a2..66239595ef 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -310,6 +310,8 @@ endmacro() + # Simply to improve readability of the main script. + #----------------------------------------------------------------------- + macro (CMAKE_BUILD_UTILITIES) ++ find_package(Threads) ++ + #--------------------------------------------------------------------- + # Create the kwsys library for CMake. + set(KWSYS_NAMESPACE cmsys) +diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt +index e7c0732675..a0010a292b 100644 +--- a/Source/CMakeLists.txt ++++ b/Source/CMakeLists.txt +@@ -765,6 +765,7 @@ target_link_libraries(CMakeLib cmsys + ${CMAKE_LIBUV_LIBRARIES} + ${CMAKE_LIBRHASH_LIBRARIES} + ${CMake_KWIML_LIBRARIES} ++ ${CMAKE_THREAD_LIBS_INIT} + ) + + if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc") -- 2.16.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 24 14:04:22 2018 Received: (at 30596) by debbugs.gnu.org; 24 Feb 2018 19:04:22 +0000 Received: from localhost ([127.0.0.1]:59020 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epf7H-0003b2-Qe for submit@debbugs.gnu.org; Sat, 24 Feb 2018 14:04:22 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:60687) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epf7A-0003aa-JE for 30596@debbugs.gnu.org; Sat, 24 Feb 2018 14:04:09 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 8004320A11; Sat, 24 Feb 2018 14:04:08 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sat, 24 Feb 2018 14:04:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=PSD+PeRyoj7SMpjHU pMfdRXEL6nJLpo2OuvG3nY4peU=; b=EUvmHJCdQKQIrVfxDtrPaa/MS+KB32gd4 xZBVcI7VEA/dPMEMJ5MSy8e0XUDruzs15de8D++PjprjYHLajYYKbUFlQl0QBJw6 4npDDIpghOTCGJDY0SrgeHMoxh4r5nlUjxAb9MncNtCyBwg9kNXgatdXzZoKGhE9 jrjqcTMFKljCn6LJdNHMMuyHsAzpR4SDXdKkhhgHPcs9U8IBet0XNY64QgO+0QEF 6ds71oqRKXFM8Sk5rtiU7T3Kn/Bgg1Hjp7h0fU3W42bjBFEFOEWyr6VvEfVEoWr/ NxkJalt1IQuLY51b2mhPHEsMR4N0Eb/0rKyrX7P8UQ8aipq6Mjadw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=PSD+PeRyoj7SMpjHUpMfdRXEL6nJLpo2OuvG3nY4peU=; b=J+9UW9NW DloNSUubhaHnY5grc8HDoIu8lcBDZOPMkmMS7FGMkiS5SXKLmjEKBi6Hm3nd5Wu6 opGFDSMohPTDTHvQg3kp0h2X5qo2Tm/rKZrcYajOdrQyA+G8u6kBgjVHRunMeTWD v6tum/Em69Ffz4Y4Gwit4zBGocdViYz4s8QDsOOY8tb8K/Ok5sq6Kw3MuPHBajuE rmzlqtMdMhzTK3dH3al6SSQimmUeqehTQRmoCVq+Mi8+Uv1rlw6L+R53I2oeBsuM Uz/AmjNdL0+VdyqhJn3O/tNwYsH661lYClJJjOwCoEiI0fHveaDAUilB7o5lzr/g XhBv7b4sILI5Yw== X-ME-Sender: Received: from localhost (cm-84.214.173.174.getinternet.no [84.214.173.174]) by mail.messagingengine.com (Postfix) with ESMTPA id 0018A24513; Sat, 24 Feb 2018 14:04:07 -0500 (EST) From: Marius Bakke To: 30596@debbugs.gnu.org Subject: [PATCH 6/6] gnu: ceph: Update to 12.2.3. Date: Sat, 24 Feb 2018 20:03:49 +0100 Message-Id: <20180224190349.8155-6-mbakke@fastmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180224190349.8155-1-mbakke@fastmail.com> References: <20180224190349.8155-1-mbakke@fastmail.com> X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 30596 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) * gnu/packages/patches/ceph-disable-cpu-optimizations.patch: Adjust to upstream changes. * gnu/packages/patches/ceph-disable-unittest-throttle.patch: Delete file. * gnu/packages/patches/ceph-rocksdb-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/storage.scm (ceph): Update to 12.2.3. [source](patches): Adjust. [arguments]: Add "-DWITH_BABELTRACE=OFF" in #:configure-flags. Build with CMAKE-3.11. Adjust file substitutions. Wrap 'ceph' executable. [inputs]: Add GPERF. Replace BOOST with BOOST-1.66. Add PYTHON2-PRETTYTABLE. --- gnu/local.mk | 2 +- .../patches/ceph-disable-cpu-optimizations.patch | 64 +++++++++------------- .../patches/ceph-disable-unittest-throttle.patch | 52 ------------------ gnu/packages/patches/ceph-rocksdb-compat.patch | 63 +++++++++++++++++++++ gnu/packages/storage.scm | 33 ++++++----- 5 files changed, 111 insertions(+), 103 deletions(-) delete mode 100644 gnu/packages/patches/ceph-disable-unittest-throttle.patch create mode 100644 gnu/packages/patches/ceph-rocksdb-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 75f275928..c80b2ac29 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -576,7 +576,7 @@ dist_patch_DATA = \ %D%/packages/patches/cdparanoia-fpic.patch \ %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \ %D%/packages/patches/ceph-disable-cpu-optimizations.patch \ - %D%/packages/patches/ceph-disable-unittest-throttle.patch \ + %D%/packages/patches/ceph-rocksdb-compat.patch \ %D%/packages/patches/ceph-skip-collect-sys-info-test.patch \ %D%/packages/patches/ceph-skip-unittest_blockdev.patch \ %D%/packages/patches/chmlib-inttypes.patch \ diff --git a/gnu/packages/patches/ceph-disable-cpu-optimizations.patch b/gnu/packages/patches/ceph-disable-cpu-optimizations.patch index f33eb629d..421b1d4fe 100644 --- a/gnu/packages/patches/ceph-disable-cpu-optimizations.patch +++ b/gnu/packages/patches/ceph-disable-cpu-optimizations.patch @@ -1,5 +1,4 @@ -Disable CPU optimizations not supported by all x86_64 systems. Also -don't add anything for i686. +Disable CPU optimizations not supported by all x86_64 systems. --- a/cmake/modules/SIMDExt.cmake 2017-03-23 22:22:58.254071694 +0100 +++ b/cmake/modules/SIMDExt.cmake 2017-03-23 22:23:22.446848845 +0100 @@ -15,39 +14,30 @@ don't add anything for i686. # # SIMD_COMPILE_FLAGS # -@@ -73,7 +68,7 @@ - set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mfpu=neon") - endif() - --elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64") -+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64") - set(HAVE_INTEL 1) - CHECK_C_COMPILER_FLAG(-msse HAVE_INTEL_SSE) - if(HAVE_INTEL_SSE) -@@ -83,26 +78,6 @@ - if(HAVE_INTEL_SSE2) - set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse2") - endif() -- CHECK_C_COMPILER_FLAG(-msse3 HAVE_INTEL_SSE3) -- if(HAVE_INTEL_SSE3) -- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse3") -- endif() -- CHECK_C_COMPILER_FLAG(-mssse3 HAVE_INTEL_SSSE3) -- if(HAVE_INTEL_SSSE3) -- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mssse3") -- endif() -- CHECK_C_COMPILER_FLAG(-mpclmul HAVE_INTEL_PCLMUL) -- if(HAVE_INTEL_PCLMUL) -- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mpclmul") -- endif() -- CHECK_C_COMPILER_FLAG(-msse4.1 HAVE_INTEL_SSE4_1) -- if(HAVE_INTEL_SSE4_1) -- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.1") -- endif() -- CHECK_C_COMPILER_FLAG(-msse4.2 HAVE_INTEL_SSE4_2) -- if(HAVE_INTEL_SSE4_2) -- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.2") -- endif() +@@ -85,26 +80,6 @@ + if(HAVE_INTEL_SSE2) + set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse2") + endif() +- CHECK_C_COMPILER_FLAG(-msse3 HAVE_INTEL_SSE3) +- if(HAVE_INTEL_SSE3) +- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse3") +- endif() +- CHECK_C_COMPILER_FLAG(-mssse3 HAVE_INTEL_SSSE3) +- if(HAVE_INTEL_SSSE3) +- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mssse3") +- endif() +- CHECK_C_COMPILER_FLAG(-mpclmul HAVE_INTEL_PCLMUL) +- if(HAVE_INTEL_PCLMUL) +- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mpclmul") +- endif() +- CHECK_C_COMPILER_FLAG(-msse4.1 HAVE_INTEL_SSE4_1) +- if(HAVE_INTEL_SSE4_1) +- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.1") +- endif() +- CHECK_C_COMPILER_FLAG(-msse4.2 HAVE_INTEL_SSE4_2) +- if(HAVE_INTEL_SSE4_2) +- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.2") +- endif() + endif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64") + endif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686|amd64|x86_64|AMD64") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(powerpc|ppc)64le") - set(HAVE_PPC64LE 1) - message(STATUS " we are ppc64le") diff --git a/gnu/packages/patches/ceph-disable-unittest-throttle.patch b/gnu/packages/patches/ceph-disable-unittest-throttle.patch deleted file mode 100644 index 08ae5f9e2..000000000 --- a/gnu/packages/patches/ceph-disable-unittest-throttle.patch +++ /dev/null @@ -1,52 +0,0 @@ -FIXME: This test broke after the gcc-5/glibc-2.25 core-updates merge. -Not sure what's going on here, it hangs after spawning the first thread. - -diff --git a/src/test/common/Throttle.cc b/src/test/common/Throttle.cc -index 5b6d73217d..40a477b2a3 100644 ---- a/src/test/common/Throttle.cc -+++ b/src/test/common/Throttle.cc -@@ -216,44 +216,6 @@ TEST_F(ThrottleTest, wait) { - } while(!waited); - } - --TEST_F(ThrottleTest, destructor) { -- Thread_get *t; -- { -- int64_t throttle_max = 10; -- Throttle *throttle = new Throttle(g_ceph_context, "throttle", throttle_max); -- -- ASSERT_FALSE(throttle->get(5)); -- -- t = new Thread_get(*throttle, 7); -- t->create("t_throttle"); -- bool blocked; -- useconds_t delay = 1; -- do { -- usleep(delay); -- if (throttle->get_or_fail(1)) { -- throttle->put(1); -- blocked = false; -- } else { -- blocked = true; -- } -- delay *= 2; -- } while(!blocked); -- delete throttle; -- } -- -- { // -- // The thread is left hanging, otherwise it will abort(). -- // Deleting the Throttle on which it is waiting creates a -- // inconsistency that will be detected: the Throttle object that -- // it references no longer exists. -- // -- pthread_t id = t->get_thread_id(); -- ASSERT_EQ(pthread_kill(id, 0), 0); -- delete t; -- ASSERT_EQ(pthread_kill(id, 0), 0); -- } --} -- - std::pair > test_backoff( - double low_threshhold, - double high_threshhold, diff --git a/gnu/packages/patches/ceph-rocksdb-compat.patch b/gnu/packages/patches/ceph-rocksdb-compat.patch new file mode 100644 index 000000000..1a3c6b0b2 --- /dev/null +++ b/gnu/packages/patches/ceph-rocksdb-compat.patch @@ -0,0 +1,63 @@ +Fix compatibility with newer versions of RocksDB. + +Adapted from this upstream patch, with some additional changes for 12.2: +https://github.com/ceph/ceph/commit/9d73a7121fdb1ae87cb1aa6f7d9d7a13f329ae68 + +diff --git a/src/kv/RocksDBStore.cc b/src/kv/RocksDBStore.cc +index 8660afe1886d..bc0de79e23cb 100644 +--- a/src/kv/RocksDBStore.cc ++++ b/src/kv/RocksDBStore.cc +@@ -505,7 +505,7 @@ + // considering performance overhead, default is disabled + if (g_conf->rocksdb_perf) { + rocksdb::SetPerfLevel(rocksdb::PerfLevel::kEnableTimeExceptForMutex); +- rocksdb::perf_context.Reset(); ++ rocksdb::get_perf_context()->Reset(); + } + + RocksDBTransactionImpl * _t = +@@ -532,13 +532,13 @@ + utime_t write_wal_time; + utime_t write_pre_and_post_process_time; + write_wal_time.set_from_double( +- static_cast(rocksdb::perf_context.write_wal_time)/1000000000); ++ static_cast(rocksdb::get_perf_context()->write_wal_time)/1000000000); + write_memtable_time.set_from_double( +- static_cast(rocksdb::perf_context.write_memtable_time)/1000000000); ++ static_cast(rocksdb::get_perf_context()->write_memtable_time)/1000000000); + write_delay_time.set_from_double( +- static_cast(rocksdb::perf_context.write_delay_time)/1000000000); ++ static_cast(rocksdb::get_perf_context()->write_delay_time)/1000000000); + write_pre_and_post_process_time.set_from_double( +- static_cast(rocksdb::perf_context.write_pre_and_post_process_time)/1000000000); ++ static_cast(rocksdb::get_perf_context()->write_pre_and_post_process_time)/1000000000); + logger->tinc(l_rocksdb_write_memtable_time, write_memtable_time); + logger->tinc(l_rocksdb_write_delay_time, write_delay_time); + logger->tinc(l_rocksdb_write_wal_time, write_wal_time); +@@ -558,7 +558,7 @@ + // considering performance overhead, default is disabled + if (g_conf->rocksdb_perf) { + rocksdb::SetPerfLevel(rocksdb::PerfLevel::kEnableTimeExceptForMutex); +- rocksdb::perf_context.Reset(); ++ rocksdb::get_perf_context()->Reset(); + } + + RocksDBTransactionImpl * _t = +@@ -586,13 +586,13 @@ + utime_t write_wal_time; + utime_t write_pre_and_post_process_time; + write_wal_time.set_from_double( +- static_cast(rocksdb::perf_context.write_wal_time)/1000000000); ++ static_cast(rocksdb::get_perf_context()->write_wal_time)/1000000000); + write_memtable_time.set_from_double( +- static_cast(rocksdb::perf_context.write_memtable_time)/1000000000); ++ static_cast(rocksdb::get_perf_context()->write_memtable_time)/1000000000); + write_delay_time.set_from_double( +- static_cast(rocksdb::perf_context.write_delay_time)/1000000000); ++ static_cast(rocksdb::get_perf_context()->write_delay_time)/1000000000); + write_pre_and_post_process_time.set_from_double( +- static_cast(rocksdb::perf_context.write_pre_and_post_process_time)/1000000000); ++ static_cast(rocksdb::get_perf_context()->write_pre_and_post_process_time)/1000000000); + logger->tinc(l_rocksdb_write_memtable_time, write_memtable_time); + logger->tinc(l_rocksdb_write_delay_time, write_delay_time); + logger->tinc(l_rocksdb_write_wal_time, write_wal_time); diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index bee349f6f..e6d566853 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -29,6 +29,7 @@ #:use-module (gnu packages bdw-gc) #:use-module (gnu packages boost) #:use-module (gnu packages check) + #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages cryptsetup) @@ -36,6 +37,7 @@ #:use-module (gnu packages databases) #:use-module (gnu packages disk) #:use-module (gnu packages gnuzilla) + #:use-module (gnu packages gperf) #:use-module (gnu packages jemalloc) #:use-module (gnu packages linux) #:use-module (gnu packages lua) @@ -50,18 +52,18 @@ (define-public ceph (package (name "ceph") - (version "12.0.2") + (version "12.2.3") (source (origin (method url-fetch) (uri (string-append "https://download.ceph.com/tarballs/ceph-" version ".tar.gz")) (sha256 (base32 - "0l9v072ba28i984y5rwny9i11nmpyx5bl7awxg48plyadm2l3g14")) + "0ysfiicbmdgqd2ni7r7yviql0dvkwbadh4n7nl297wpk5bgjrk5y")) (patches (search-patches "ceph-skip-unittest_blockdev.patch" "ceph-skip-collect-sys-info-test.patch" - "ceph-disable-unittest-throttle.patch" + "ceph-rocksdb-compat.patch" "ceph-disable-cpu-optimizations.patch")) (modules '((guix build utils))) (snippet @@ -74,7 +76,6 @@ ;"src/xxHash" ;"src/zstd" ;"src/civetweb" - ;"src/Beast" "src/test/downloads" "src/dpdk" "src/spdk" @@ -105,6 +106,7 @@ "-DWITH_SYSTEM_BOOST=ON" "-DWITH_PYTHON3=ON" ;; TODO: Enable these when available in Guix. + "-DWITH_BABELTRACE=OFF" "-DWITH_LTTNG=OFF" "-DWITH_XFS=OFF" "-DWITH_XIO=OFF" @@ -114,6 +116,7 @@ ;; for details. Disable tests until ;; resolved. #:tests? #f + #:cmake ,cmake-3.11 #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source @@ -152,21 +155,17 @@ (substitute* "src/test/test_subprocess.cc" (("/bin/sh") (which "sh"))) - (substitute* "src/test/ceph_objectstore_tool.py" + (substitute* "qa/standalone/special/ceph_objectstore_tool.py" (("/bin/rm") (which "rm"))) (substitute* "src/ceph-disk/ceph_disk/main.py" (("/bin/mount") "mount") (("/bin/umount") "umount") (("/sbin/blkid") (which "blkid")) + (("'cryptsetup'") (string-append "'" (which "cryptsetup") "'")) (("'sgdisk'") (string-append "'" (which "sgdisk") "'")) (("'parted'") (string-append "'" (which "parted") "'")) (("'udevadm'") (string-append "'" (which "udevadm") "'"))) - (substitute* "src/ceph-disk-udev" - (("/sbin/cryptsetup") (which "cryptsetup")) - (("/usr/sbin/sgdisk") (which "sgdisk")) - (("/usr/sbin/ceph-disk") - (string-append out "/bin/ceph-disk"))) (substitute* "udev/50-rbd.rules" (("/usr/bin/ceph-rbdnamer") (string-append out "/bin/ceph-rbdnamer"))) @@ -265,16 +264,22 @@ (add-after 'install 'wrap-python-scripts (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) + (ceph (string-append out "/bin/ceph")) (ceph-disk (string-append out "/bin/ceph-disk")) (ceph-detect-init (string-append out "/bin/ceph-detect-init")) + (sitedir (package) + (string-append package + "/lib/python2.7/site-packages")) + (prettytable (assoc-ref inputs "python2-prettytable")) (PYTHONPATH (string-append - out "/lib/python2.7/site-packages"))) + (sitedir out) ":" + (sitedir prettytable)))) (for-each (lambda (executable) (wrap-program executable `("PYTHONPATH" ":" prefix (,PYTHONPATH)))) - (list ceph-disk ceph-detect-init)) + (list ceph ceph-disk ceph-detect-init)) #t)))))) (outputs '("out" "lib")) @@ -310,12 +315,13 @@ ("python2-testtools" ,python2-testtools) ("python2-tox" ,python2-tox))) (inputs - `(("boost" ,boost) + `(("boost" ,boost-1.66) ("curl" ,curl) ("cryptsetup" ,cryptsetup) ("expat" ,expat) ("fcgi" ,fcgi) ("fuse" ,fuse) + ("gperf" ,gperf) ("gptfdisk" ,gptfdisk) ("jemalloc" ,jemalloc) ("keyutils" ,keyutils) @@ -329,6 +335,7 @@ ("nss" ,nss) ("parted" ,parted) ("python@2" ,python-2) + ("python2-prettytable" ,python2-prettytable) ;used by ceph_daemon.py ("python@3" ,python-3) ("rocksdb" ,rocksdb) ("snappy" ,snappy) -- 2.16.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 03 16:32:03 2018 Received: (at 30596) by debbugs.gnu.org; 3 Mar 2018 21:32:03 +0000 Received: from localhost ([127.0.0.1]:43126 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1esEl9-0005um-LD for submit@debbugs.gnu.org; Sat, 03 Mar 2018 16:32:03 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:54540) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1esEl8-0005tb-D4 for 30596@debbugs.gnu.org; Sat, 03 Mar 2018 16:32:02 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id E666C11D90; Sat, 3 Mar 2018 22:32:01 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YNe8s4qu7hSy; Sat, 3 Mar 2018 22:32:00 +0100 (CET) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 8A07610C99; Sat, 3 Mar 2018 22:32:00 +0100 (CET) From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: [bug#30596] [PATCH 1/6] gnu: rocksdb: Update to 5.10.3. References: <20180224190122.8009-1-mbakke@fastmail.com> <20180224190349.8155-1-mbakke@fastmail.com> Date: Sat, 03 Mar 2018 22:31:59 +0100 In-Reply-To: <20180224190349.8155-1-mbakke@fastmail.com> (Marius Bakke's message of "Sat, 24 Feb 2018 20:03:44 +0100") Message-ID: <87y3j89774.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 30596 Cc: 30596@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) Marius Bakke skribis: > * 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. LGTM, thanks! From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 03 16:32:37 2018 Received: (at 30596) by debbugs.gnu.org; 3 Mar 2018 21:32:37 +0000 Received: from localhost ([127.0.0.1]:43129 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1esElg-0005yd-Th for submit@debbugs.gnu.org; Sat, 03 Mar 2018 16:32:37 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:54554) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1esElf-0005yW-GW for 30596@debbugs.gnu.org; Sat, 03 Mar 2018 16:32:35 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 0587811D90; Sat, 3 Mar 2018 22:32:35 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HezlMgjEXquq; Sat, 3 Mar 2018 22:32:34 +0100 (CET) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id EA0B010C99; Sat, 3 Mar 2018 22:32:33 +0100 (CET) From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: [bug#30596] [PATCH 2/6] gnu: snappy: Update to 1.1.7. References: <20180224190349.8155-1-mbakke@fastmail.com> <20180224190349.8155-2-mbakke@fastmail.com> Date: Sat, 03 Mar 2018 22:32:33 +0100 In-Reply-To: <20180224190349.8155-2-mbakke@fastmail.com> (Marius Bakke's message of "Sat, 24 Feb 2018 20:03:45 +0100") Message-ID: <87tvtw9766.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 30596 Cc: 30596@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) Marius Bakke skribis: > * gnu/packages/compression.scm (snappy): Update to 1.1.7. > [source]: Change to git archive. Set file-name. > [build-system]: Change to CMAKE-BUILD-SYSTEM. > [arguments]: Add #:configure-flags. > [description]: Fix infractions. LGTM! From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 03 16:33:01 2018 Received: (at 30596) by debbugs.gnu.org; 3 Mar 2018 21:33:01 +0000 Received: from localhost ([127.0.0.1]:43132 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1esEm5-0005zK-5k for submit@debbugs.gnu.org; Sat, 03 Mar 2018 16:33:01 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:54562) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1esEm3-0005z8-B3 for 30596@debbugs.gnu.org; Sat, 03 Mar 2018 16:32:59 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id D4B6811D90; Sat, 3 Mar 2018 22:32:58 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fEn5GWpX53D0; Sat, 3 Mar 2018 22:32:58 +0100 (CET) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id D795510C99; Sat, 3 Mar 2018 22:32:57 +0100 (CET) From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: [bug#30596] [PATCH 3/6] gnu: java-snappy: Update to 1.1.7. References: <20180224190349.8155-1-mbakke@fastmail.com> <20180224190349.8155-3-mbakke@fastmail.com> Date: Sat, 03 Mar 2018 22:32:57 +0100 In-Reply-To: <20180224190349.8155-3-mbakke@fastmail.com> (Marius Bakke's message of "Sat, 24 Feb 2018 20:03:46 +0100") Message-ID: <87po4k975i.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 30596 Cc: 30596@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) Marius Bakke skribis: > * gnu/packages/compression.scm (java-snappy): Update to 1.1.7. > [arguments]: Use INVOKE instead of SYSTEM*. Avoid CMAKE dependency. Delete > Hadoop test. Enable fixed test. > [native-inputs]: Add JAVA-COMMONS-LANG and JAVA-COMMONS-IO. LGTM! From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 03 16:33:35 2018 Received: (at 30596) by debbugs.gnu.org; 3 Mar 2018 21:33:35 +0000 Received: from localhost ([127.0.0.1]:43138 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1esEmd-00060d-Fk for submit@debbugs.gnu.org; Sat, 03 Mar 2018 16:33:35 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:54582) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1esEmb-00060V-Kc for 30596@debbugs.gnu.org; Sat, 03 Mar 2018 16:33:33 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 2CD8E11D90; Sat, 3 Mar 2018 22:33:33 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TN2U939Zsolb; Sat, 3 Mar 2018 22:33:32 +0100 (CET) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 0393310C99; Sat, 3 Mar 2018 22:33:31 +0100 (CET) From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: [bug#30596] [PATCH 4/6] gnu: Add boost@1.66.0. References: <20180224190349.8155-1-mbakke@fastmail.com> <20180224190349.8155-4-mbakke@fastmail.com> Date: Sat, 03 Mar 2018 22:33:31 +0100 In-Reply-To: <20180224190349.8155-4-mbakke@fastmail.com> (Marius Bakke's message of "Sat, 24 Feb 2018 20:03:47 +0100") Message-ID: <87lgf8974k.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 30596 Cc: 30596@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) Marius Bakke skribis: > * gnu/packages/boost.scm (boost-1.66): New public variable. LGTM. We=E2=80=99ll do the actual upgrade in =E2=80=98core-updates=E2=80=99, righ= t? Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 03 16:35:34 2018 Received: (at 30596) by debbugs.gnu.org; 3 Mar 2018 21:35:34 +0000 Received: from localhost ([127.0.0.1]:43142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1esEoX-00063U-S0 for submit@debbugs.gnu.org; Sat, 03 Mar 2018 16:35:34 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:54594) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1esEoS-00063I-PE for 30596@debbugs.gnu.org; Sat, 03 Mar 2018 16:35:31 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 438AC11D90; Sat, 3 Mar 2018 22:35:28 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZLS13ob_dVIC; Sat, 3 Mar 2018 22:35:27 +0100 (CET) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 2172610C99; Sat, 3 Mar 2018 22:35:27 +0100 (CET) From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: [bug#30596] [PATCH 5/6] gnu: Add cmake@3.11. References: <20180224190349.8155-1-mbakke@fastmail.com> <20180224190349.8155-5-mbakke@fastmail.com> Date: Sat, 03 Mar 2018 22:35:26 +0100 In-Reply-To: <20180224190349.8155-5-mbakke@fastmail.com> (Marius Bakke's message of "Sat, 24 Feb 2018 20:03:48 +0100") Message-ID: <87h8pw971d.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 30596 Cc: 30596@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) Marius Bakke skribis: > * gnu/packages/patches/cmake-3.11-pthread-fix.patch: New file. > * gnu/local.mk (dist_patch_DATA): Register it. > * gnu/packages/cmake.scm (cmake-3.11): New public variable. [...] > +;; Recent Ceph requires Boost 1.66, which in turn requires CMake 3.11 for > +;; its updated "FindBoost.cmake" facility. > +(define-public cmake-3.11 The actual upgrade is for =E2=80=98core-updates=E2=80=99 as well I guess? > + (arguments > + `(,@(substitute-keyword-arguments (package-arguments cmake) > + ((#:phases phases) Or simply: (arguments (substitute-keyword-arguments =E2=80=A6)) Otherwise LGTM, thanks! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 03 16:37:42 2018 Received: (at 30596) by debbugs.gnu.org; 3 Mar 2018 21:37:42 +0000 Received: from localhost ([127.0.0.1]:43146 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1esEqc-00066Q-8X for submit@debbugs.gnu.org; Sat, 03 Mar 2018 16:37:42 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:54610) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1esEqY-00066G-Jb for 30596@debbugs.gnu.org; Sat, 03 Mar 2018 16:37:40 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id E739D11D90; Sat, 3 Mar 2018 22:37:37 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nO6ILr-up0NX; Sat, 3 Mar 2018 22:37:37 +0100 (CET) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id AD5EF10C99; Sat, 3 Mar 2018 22:37:36 +0100 (CET) From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: [bug#30596] [PATCH 6/6] gnu: ceph: Update to 12.2.3. References: <20180224190349.8155-1-mbakke@fastmail.com> <20180224190349.8155-6-mbakke@fastmail.com> Date: Sat, 03 Mar 2018 22:37:35 +0100 In-Reply-To: <20180224190349.8155-6-mbakke@fastmail.com> (Marius Bakke's message of "Sat, 24 Feb 2018 20:03:49 +0100") Message-ID: <87d10k96xs.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 30596 Cc: 30596@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) Marius Bakke skribis: > * gnu/packages/patches/ceph-disable-cpu-optimizations.patch: Adjust to > upstream changes. > * gnu/packages/patches/ceph-disable-unittest-throttle.patch: Delete file. > * gnu/packages/patches/ceph-rocksdb-compat.patch: New file. > * gnu/local.mk (dist_patch_DATA): Adjust accordingly. > * gnu/packages/storage.scm (ceph): Update to 12.2.3. > [source](patches): Adjust. > [arguments]: Add "-DWITH_BABELTRACE=3DOFF" in #:configure-flags. Build w= ith > CMAKE-3.11. Adjust file substitutions. Wrap 'ceph' executable. > [inputs]: Add GPERF. Replace BOOST with BOOST-1.66. Add PYTHON2-PRETTYT= ABLE. Are you sure gperf shouldn't be in =E2=80=98native-inputs=E2=80=99? Otherwise LGTM. That was not an easy one! Thank you, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 04 11:58:12 2018 Received: (at 30596) by debbugs.gnu.org; 4 Mar 2018 16:58:12 +0000 Received: from localhost ([127.0.0.1]:44621 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1esWxf-0005fu-Rl for submit@debbugs.gnu.org; Sun, 04 Mar 2018 11:58:12 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:50467) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1esWxa-0005fi-IA for 30596@debbugs.gnu.org; Sun, 04 Mar 2018 11:58:09 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id D1EDD20A47; Sun, 4 Mar 2018 11:58:05 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Sun, 04 Mar 2018 11:58:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=Uev3+iBHbQfFqhGJuY1r23s1LyMl1KcQ/Ex5Lzk51Bg=; b=cq/ZMccS Jt2Yu46lL5xdQIaqGGhmhuXLhMNEejQ5evY9vAhXm34v4eZF6G4G1X1H8e4FzidY J0iPA7G6SrcCba7/BX6XWWFNBIMKDrT0kU6+yJyCFuwhr6BEUVbS/lOkyqnOF1ur jPLE5WoTlJycZFls2O9lpta2D6dUy0NL1RRpC+GoVHrBVE0g+BlilhJkqYls1Rn5 GZJtJYkJaQhIGG/37mDJ7f6TODf1wIaz6k0IbbFaE+vIzyUmp6fOmtbjyWnvHZlS fncictgAsc2YBeu/nIVXbEGbjYCDAURn2kdw3o9iiVFRFQcGiswA/P1RKEiuuuRp 5Pl0ajXOdITe5w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=Uev3+iBHbQfFqhGJuY1r23s1LyMl1 KcQ/Ex5Lzk51Bg=; b=R/+MGb1fHi/Ge1N74UKTPyYFwYxDomYUtSZ4qpThgsMf+ 2IGAP24fzA0hdw2blz40LAbzsD/wJfSReZ0FzrPQcioiRZh3/LRott7HZokuMIZ0 9OY0WjV+FbwE1SinyKAvuQ0nlH9Yep9MQLu/1RXB5v4bA4vIN8+ya1CuRoQ0lLyr R8pPElp7U9x7QNES6wSNFXtKDBZkcbGxS70djnNuvwzAziG+IC3suUJy689urHBU ImQbKRVbokEMfphHFw14iiU4s72HeeCzfi0S78Y/A9lInZmXXLp2PpQ1QwJfnbcI OSaqHrIX8YTw+FPRffO0rY5JcEGwGPEAAMEiofWMQ== X-ME-Sender: Received: from localhost (cm-84.214.173.174.getinternet.no [84.214.173.174]) by mail.messagingengine.com (Postfix) with ESMTPA id 2DB937E1F3; Sun, 4 Mar 2018 11:58:05 -0500 (EST) From: Marius Bakke To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#30596] [PATCH 5/6] gnu: Add cmake@3.11. In-Reply-To: <87h8pw971d.fsf@gnu.org> References: <20180224190349.8155-1-mbakke@fastmail.com> <20180224190349.8155-5-mbakke@fastmail.com> <87h8pw971d.fsf@gnu.org> User-Agent: Notmuch/0.26 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) Date: Sun, 04 Mar 2018 17:58:03 +0100 Message-ID: <87o9k322xw.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 30596 Cc: 30596@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Marius Bakke skribis: > >> * gnu/packages/patches/cmake-3.11-pthread-fix.patch: New file. >> * gnu/local.mk (dist_patch_DATA): Register it. >> * gnu/packages/cmake.scm (cmake-3.11): New public variable. > > [...] > >> +;; Recent Ceph requires Boost 1.66, which in turn requires CMake 3.11 f= or >> +;; its updated "FindBoost.cmake" facility. >> +(define-public cmake-3.11 > > The actual upgrade is for =E2=80=98core-updates=E2=80=99 as well I guess? I think Arun had a patch for 3.10 on the way. With luck, 3.11 gets released in time too. > >> + (arguments >> + `(,@(substitute-keyword-arguments (package-arguments cmake) >> + ((#:phases phases) > > Or simply: > > (arguments > (substitute-keyword-arguments =E2=80=A6)) Ahh, of course! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlqcJZsACgkQoqBt8qM6 VPp+LQf/b4TDVebvKcrxRTItJQam/eaqlj6AWAM9BZebfyBSDAKPGsrCxzs7WCwV DOnhCBWFWH3ebbfQMi8abNfA5ePlH8AudIbW+fzqrvfYPwxr3YKIPTy9JWjDUgj9 i0nhVhX/APvkdrreyxQj8dSbxpmLPBC1oKkl2yaUPOCOHxWnD2i6qySobyRPEP23 7ekqCRkoevvWryiSN+i7wD03Im+6JirfvyIF0x87tAvDP3k7Domk7+1gHlliZRoW Y6Rq//Udr1UhvhN6EqIrMxAMy41/C8tjhb6ouAqgd3T8dHBBj342xEJT0D1y3y7O qHJiCyasAzsx5Imz7NIc0dhUy0+NuA== =qegb -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 04 11:59:14 2018 Received: (at 30596-done) by debbugs.gnu.org; 4 Mar 2018 16:59:14 +0000 Received: from localhost ([127.0.0.1]:44627 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1esWyg-0005hS-5w for submit@debbugs.gnu.org; Sun, 04 Mar 2018 11:59:14 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:58999) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1esWyc-0005hI-T3 for 30596-done@debbugs.gnu.org; Sun, 04 Mar 2018 11:59:13 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 9BB4F20AB1; Sun, 4 Mar 2018 11:59:10 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Sun, 04 Mar 2018 11:59:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=1Uy6U9lzzFDIJ2z/tqmpi12n3LGr0sWQxM0dzzVSWyU=; b=ah5ZwP3S W3brjvkT6qw8VnhdSBdMm019CgeXPDD4XEqy4sNeFYzjaCAtM5auX52ZUxgdaPaD xUz03N0L/4gkgweleMVuccA4o4PiTKrvLVN0VAc/yauPun7o4OeD7M5cBqOBCbkQ ZS+8UIXcMGdzyoedvdnmfkluAIzuSedUNDxCMgf/TbgCGJzGIuom19fJOzQ152UL glyAez2ZPs9q0UXpQm5695b6ifQcEo149jmL7Io72J51YOcIk1vEj0UBzmlFMQyI m4ctjBEQgWFSO3dqtTkmPr67SFDSf4V5GOu/eWkYw0o7UiS1fNCdRc456XCjtMyl S8mAJdp5QC3R1w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=1Uy6U9lzzFDIJ2z/tqmpi12n3LGr0 sWQxM0dzzVSWyU=; b=f1ky3JVYbKfZZhKjmD4TdPYFtUTSUNtS94dHmCObql79b M0sapahoG/UD/efDof3hEpJ0k2ynLCxgDHV8mHmDkWoa89FMe/DTt1o2po8YUf94 WC+e1U0Zf2m+A7SdCU6g0Mq1yP5ThbDl5avsgHjPaYS/q8RRIZzb6qQjMaXxJMJX 6eEck2BYI8Xf7AVlhaZRVWtOCb0rKUt/O3MkfkSELc/F1asP7f36bdU2W2CbKDY5 HVbtVyKWpgBbmGRmuoW+TtZHf+ooPC2aLhK9gsU+gcfZctv1ZBR8/r7spNg+nML6 UgOxNswBE11NpFduqtwV+c9Z1oWjYMtTSytDTc4vg== X-ME-Sender: Received: from localhost (cm-84.214.173.174.getinternet.no [84.214.173.174]) by mail.messagingengine.com (Postfix) with ESMTPA id 2F2207E0DF; Sun, 4 Mar 2018 11:59:10 -0500 (EST) From: Marius Bakke To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#30596] [PATCH 6/6] gnu: ceph: Update to 12.2.3. In-Reply-To: <87d10k96xs.fsf@gnu.org> References: <20180224190349.8155-1-mbakke@fastmail.com> <20180224190349.8155-6-mbakke@fastmail.com> <87d10k96xs.fsf@gnu.org> User-Agent: Notmuch/0.26 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) Date: Sun, 04 Mar 2018 17:59:08 +0100 Message-ID: <87lgf722w3.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 30596-done Cc: 30596-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Marius Bakke skribis: > >> * gnu/packages/patches/ceph-disable-cpu-optimizations.patch: Adjust to >> upstream changes. >> * gnu/packages/patches/ceph-disable-unittest-throttle.patch: Delete file. >> * gnu/packages/patches/ceph-rocksdb-compat.patch: New file. >> * gnu/local.mk (dist_patch_DATA): Adjust accordingly. >> * gnu/packages/storage.scm (ceph): Update to 12.2.3. >> [source](patches): Adjust. >> [arguments]: Add "-DWITH_BABELTRACE=3DOFF" in #:configure-flags. Build = with >> CMAKE-3.11. Adjust file substitutions. Wrap 'ceph' executable. >> [inputs]: Add GPERF. Replace BOOST with BOOST-1.66. Add PYTHON2-PRETTY= TABLE. > > Are you sure gperf shouldn't be in =E2=80=98native-inputs=E2=80=99? Gperf is indeed a native input. Thanks for reviewing! Pushed to master, with even newer versions of RocksDB, Ceph and CMake. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlqcJdwACgkQoqBt8qM6 VPrV7Af/f2+cBTyO3T9+dg5Ih+iwgf0czpE/OyvyA6PWYqwkNsjqxdz2Bh9A9ubZ Of8NDeMA4UcSYCWG0j2USvQTRz0cGbuj5Wk9TFJzNkbtMiAZcdSOJ9uxoBJuFpGn HuPCsc5Fs6pZ+JQUDj6OVIR4LghMnCWw3IogThNdSgx3/Yn8jNMvljrhL1cizmLF k0HPFmny5dawGzQ3cIAD4uDgo+k+rCjCK9qxzioJgh8nKogs2I8DRgHWR3GA+6gK 9INY4m0PVD1YeSC0KnhEMYGWbB5oUzu3DnRZQ1Lnx/jcV5lJCJnwU3aSDP5CZgBn WWHNFRmZuvbpHaQ/FLOVagu49AeA8Q== =svZC -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Aug 17 22:01:05 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 02 Apr 2018 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator