From unknown Wed Aug 20 01:19:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#30390] [PATCH 0/3] Update cmake to 3.10.2. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Feb 2018 12:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 30390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 30390@debbugs.gnu.org Cc: Arun Isaac X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.151809206719710 (code B ref -1); Thu, 08 Feb 2018 12:15:01 +0000 Received: (at submit) by debbugs.gnu.org; 8 Feb 2018 12:14:27 +0000 Received: from localhost ([127.0.0.1]:33769 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ejl5v-00057o-Hv for submit@debbugs.gnu.org; Thu, 08 Feb 2018 07:14:27 -0500 Received: from eggs.gnu.org ([208.118.235.92]:41583) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ejl5s-00057Z-Dl for submit@debbugs.gnu.org; Thu, 08 Feb 2018 07:14:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ejl5i-00023K-8n for submit@debbugs.gnu.org; Thu, 08 Feb 2018 07:14:19 -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.0 required=5.0 tests=BAYES_20,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:56986) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ejl5i-000234-5G for submit@debbugs.gnu.org; Thu, 08 Feb 2018 07:14:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejl5f-0008F8-Kt for guix-patches@gnu.org; Thu, 08 Feb 2018 07:14:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ejl5e-00020c-NI for guix-patches@gnu.org; Thu, 08 Feb 2018 07:14:11 -0500 Received: from [2001:19f0:5:274f:4827:c39:448f:6777] (port=53058 helo=vultr.systemreboot.net) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ejl5e-0001vm-68 for guix-patches@gnu.org; Thu, 08 Feb 2018 07:14:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Message-Id:Date:Subject:Cc:To:From:Sender: Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=2Rd3eaItwADFpMa9vXw21S7DYm+JJBVKXmh302MV5yU=; b=YShl/txrNwK9qcORnJpCKDuM7F B+3Xwk4XlaYLy9oFZwk19fZFJOLoJK5DI8Gx7IyBugENuKTLDP2KDVUumU9hRASh9vE43vnd26N56 6eAwlULxMJ+JA7pxTgi7nFPx/5nlVPVwJ36Hq8ByBoEUpVnujgTGRZYkQyWZFRJd8jMk=; Received: from [45.125.43.69] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90) (envelope-from ) id 1ejl5X-0001Rg-Ua; Thu, 08 Feb 2018 17:44:04 +0530 From: Arun Isaac Date: Thu, 8 Feb 2018 17:43:23 +0530 Message-Id: <20180208121323.14840-1-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.15.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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.1 (----) 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.1 (----) Looks like we have missed several releases of cmake. I have upgraded to 3.10.2, the latest release. About the jsoncpp circular dependency: jsoncpp upstream has switched from the cmake build system to the meson build system. So, the circular dependency can now be avoided. I was able to successfully build jsoncpp with our meson-build-system. However, cmake failed to build with this new jsoncpp. I couldn't figure out how to proceed. So, I abandoned that effort, and left cmake to use its bundled jsoncpp. About the bundled libuv: The cmake build fails if the bundled libuv is deleted (look at the snippet). I had to avoid deleting it for the build to work. Arun Isaac (3): gnu: Add rhash. gnu: libuv: Update to 1.19.1. gnu: cmake: Update to 3.10.2. gnu/local.mk | 1 - gnu/packages/cmake.scm | 153 ++++++++++++++++------------- gnu/packages/crypto.scm | 50 ++++++++++ gnu/packages/libevent.scm | 20 ++-- gnu/packages/patches/cmake-fix-tests.patch | 120 ---------------------- 5 files changed, 143 insertions(+), 201 deletions(-) delete mode 100644 gnu/packages/patches/cmake-fix-tests.patch -- 2.15.1 From unknown Wed Aug 20 01:19:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#30390] [PATCH 1/3] gnu: Add rhash. References: <20180208121323.14840-1-arunisaac@systemreboot.net> In-Reply-To: <20180208121323.14840-1-arunisaac@systemreboot.net> Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Feb 2018 12:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 30390@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 30390-submit@debbugs.gnu.org id=B30390.151809229820279 (code B ref 30390); Thu, 08 Feb 2018 12:19:01 +0000 Received: (at 30390) by debbugs.gnu.org; 8 Feb 2018 12:18:18 +0000 Received: from localhost ([127.0.0.1]:33777 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ejl9a-0005Gj-1k for submit@debbugs.gnu.org; Thu, 08 Feb 2018 07:18:18 -0500 Received: from vultr.systemreboot.net ([45.77.148.100]:37512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ejl9X-0005GS-CL for 30390@debbugs.gnu.org; Thu, 08 Feb 2018 07:18:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=7eGOaIqpGEXsVydSBJz5LjmAZZQqNxBre7yWlX5TzYI=; b=f5iJ1rruKd3bEj2DBwcB6/qwUv ePPpz5yGKZlK/pqzmcSffbmvJovJAWb6LRggt0KncZm++M56mXEg08ndHjX0krhLAO5aUxg0okCMu Ao6UNffHT+BpzjjhsH3Z7T8eVAAk0Kjl5UUfVTxFAB6ekFrLV4AANRYurgdVwC6yD1cM=; Received: from [45.125.43.69] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90) (envelope-from ) id 1ejl9N-0001mC-Da; Thu, 08 Feb 2018 17:48:01 +0530 From: Arun Isaac Date: Thu, 8 Feb 2018 17:47:45 +0530 Message-Id: <20180208121747.15072-1-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.15.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) 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/crypto.scm (rhash): New variable. --- gnu/packages/crypto.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index e616c9223..65d1283e1 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2016, 2017 Eric Bavier ;;; Copyright © 2017 Pierre Langlois ;;; Copyright © 2018 Efraim Flashner +;;; Copyright © 2018 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -663,3 +664,52 @@ that are faster than MD5, SHA-1, SHA-2, and SHA-3, yet are at least as secure as the latest standard, SHA-3. It is an improved version of the SHA-3 finalist BLAKE.") (license license:public-domain)))) + +(define-public rhash + (package + (name "rhash") + (version "1.3.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/rhash/RHash/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0bhz3xdl6r06k1bqigdjz42l31iqz2qdpg7zk316i7p2ra56iq4q")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list "CC=gcc" + (string-append "PREFIX=" %output)) + #:test-target "test" + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile" + (("\\$\\(DESTDIR\\)/etc") + (string-append (assoc-ref outputs "out") "/etc"))) + #t)) + (add-after 'build 'build-library + (lambda* (#:key outputs make-flags #:allow-other-keys) + (apply invoke "make" "lib-shared" make-flags) + #t)) + (add-after 'install 'install-library + (lambda* (#:key outputs make-flags #:allow-other-keys) + (apply invoke "make" "install-lib-shared" make-flags) + (apply invoke + "make" "-C" "librhash" "install-headers" + "install-so-link" make-flags) + #t)) + (add-after 'check 'check-library + (lambda* (#:key outputs make-flags #:allow-other-keys) + (apply invoke "make" "test-shared-lib" make-flags) + #t))))) + (home-page "https://sourceforge.net/projects/rhash/") + (synopsis "Utility for computing hash sums") + (description "RHash is a console utility for calculation and verification +of magnet links and a wide range of hash sums like CRC32, MD4, MD5, SHA1, +SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R +34.11-94, RIPEMD-160, HAS-160, EDON-R, Whirlpool and Snefru.") + (license (license:fsf-free "file://COPYING")))) -- 2.15.1 From unknown Wed Aug 20 01:19:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#30390] [PATCH 2/3] gnu: libuv: Update to 1.19.1. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Feb 2018 12:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 30390@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 30390-submit@debbugs.gnu.org id=B30390.151809229820286 (code B ref 30390); Thu, 08 Feb 2018 12:19:02 +0000 Received: (at 30390) by debbugs.gnu.org; 8 Feb 2018 12:18:18 +0000 Received: from localhost ([127.0.0.1]:33781 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ejl9e-0005H3-36 for submit@debbugs.gnu.org; Thu, 08 Feb 2018 07:18:18 -0500 Received: from vultr.systemreboot.net ([45.77.148.100]:37520) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ejl9Z-0005GY-K0 for 30390@debbugs.gnu.org; Thu, 08 Feb 2018 07:18:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=9N25DxBPDtI+mAaymljru+BzWA7D4RgMm0/vG74xYgw=; b=LNn2G6ZzuMldWbN0E3Lh9Z5BZ ainvKrpka84/bppehoHbtXGVVOw9GsP473YoM3tML9cJaqYSfC9cM84fvQL8BvuV6D0rVV1v6i1hw sJn0ZsNNULNRirq7axF3OqddcEXv0zu5gXUYBmI/bgOgpcX7vmwBazs0ETy2puGD3u5c8=; Received: from [45.125.43.69] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90) (envelope-from ) id 1ejl9P-0001mC-Vz; Thu, 08 Feb 2018 17:48:04 +0530 From: Arun Isaac Date: Thu, 8 Feb 2018 17:47:46 +0530 Message-Id: <20180208121747.15072-2-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180208121747.15072-1-arunisaac@systemreboot.net> References: <20180208121747.15072-1-arunisaac@systemreboot.net> X-Spam-Score: 1.7 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/libevent.scm (libuv): Update to 1.19.1. [arguments]: Use modify-phases. --- gnu/packages/libevent.scm | 20 ++++++++++ 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index b613bf138..34b23d537 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -121,24 +121,24 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.14.1") + (version "1.19.1") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "08kx4mzjsdv90n9pivqxqjxlxk5vaf9p33zzvx661dwfmp9468pk")))) + "0y78029vhfhjwpbwg9c0p8ih8489azpfa9sjnzj2bksf6r29kv9j")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-cons-after - 'unpack 'autogen - (lambda _ - ;; Fashionable people don't run 'make dist' these days, so - ;; we need to do that ourselves. - (zero? (system* "sh" "autogen.sh"))) - %standard-phases) - + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'autogen + (lambda _ + ;; Fashionable people don't run 'make dist' these days, so + ;; we need to do that ourselves. + (invoke "./autogen.sh") + #t))) ;; XXX: Some tests want /dev/tty, attempt to make connections, etc. #:tests? #f)) (native-inputs `(("autoconf" , (autoconf-wrapper)) -- 2.15.1 [...] Content analysis details: (1.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.7 URIBL_BLACK Contains an URL listed in the URIBL blacklist [URIs: autogen.sh] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid 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.7 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/libevent.scm (libuv): Update to 1.19.1. [arguments]: Use modify-phases. --- gnu/packages/libevent.scm | 20 ++++++++++ 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index b613bf138..34b23d537 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -121,24 +121,24 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.14.1") + (version "1.19.1") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "08kx4mzjsdv90n9pivqxqjxlxk5vaf9p33zzvx661dwfmp9468pk")))) + "0y78029vhfhjwpbwg9c0p8ih8489azpfa9sjnzj2bksf6r29kv9j")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-cons-after - 'unpack 'autogen - (lambda _ - ;; Fashionable people don't run 'make dist' these days, so - ;; we need to do that ourselves. - (zero? (system* "sh" "autogen.sh"))) - %standard-phases) - + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'autogen + (lambda _ + ;; Fashionable people don't run 'make dist' these days, so + ;; we need to do that ourselves. + (invoke "./autogen.sh") + #t))) ;; XXX: Some tests want /dev/tty, attempt to make connections, etc. #:tests? #f)) (native-inputs `(("autoconf" ,(autoconf-wrapper)) -- 2.15.1 [...] Content analysis details: (1.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.7 URIBL_BLACK Contains an URL listed in the URIBL blacklist [URIs: autogen.sh] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid * gnu/packages/libevent.scm (libuv): Update to 1.19.1. [arguments]: Use modify-phases. --- gnu/packages/libevent.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index b613bf138..34b23d537 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -121,24 +121,24 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.14.1") + (version "1.19.1") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "08kx4mzjsdv90n9pivqxqjxlxk5vaf9p33zzvx661dwfmp9468pk")))) + "0y78029vhfhjwpbwg9c0p8ih8489azpfa9sjnzj2bksf6r29kv9j")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-cons-after - 'unpack 'autogen - (lambda _ - ;; Fashionable people don't run 'make dist' these days, so - ;; we need to do that ourselves. - (zero? (system* "sh" "autogen.sh"))) - %standard-phases) - + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'autogen + (lambda _ + ;; Fashionable people don't run 'make dist' these days, so + ;; we need to do that ourselves. + (invoke "./autogen.sh") + #t))) ;; XXX: Some tests want /dev/tty, attempt to make connections, etc. #:tests? #f)) (native-inputs `(("autoconf" ,(autoconf-wrapper)) -- 2.15.1 From unknown Wed Aug 20 01:19:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#30390] [PATCH 3/3] gnu: cmake: Update to 3.10.2. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Feb 2018 12:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 30390@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 30390-submit@debbugs.gnu.org id=B30390.151809230520301 (code B ref 30390); Thu, 08 Feb 2018 12:19:02 +0000 Received: (at 30390) by debbugs.gnu.org; 8 Feb 2018 12:18:25 +0000 Received: from localhost ([127.0.0.1]:33783 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ejl9e-0005H9-B5 for submit@debbugs.gnu.org; Thu, 08 Feb 2018 07:18:25 -0500 Received: from vultr.systemreboot.net ([45.77.148.100]:37516) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ejl9Z-0005GX-Cf for 30390@debbugs.gnu.org; Thu, 08 Feb 2018 07:18:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Mzw6qr6QKvK3hnmRljgLtH+m3UgV8O/LGTXxVERlO/8=; b=L4eCOo5RxfFCx25Q2s3aCIeQ+H xfmsiu8g76d6RpMHqYx5wz3C6P52+Sg1sFu6sJvPOhe1CWzSYDO/T7cR9AvO2HpRYVgzYVATBy0fI sLpj45TQyIzl+G/9E/j2W8kzY6u3SkXeHcZaLKUsqRndusfwcBr8FVB5vOW7vSI4m+ts=; Received: from [45.125.43.69] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90) (envelope-from ) id 1ejl9S-0001mC-8x; Thu, 08 Feb 2018 17:48:06 +0530 From: Arun Isaac Date: Thu, 8 Feb 2018 17:47:47 +0530 Message-Id: <20180208121747.15072-3-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180208121747.15072-1-arunisaac@systemreboot.net> References: <20180208121747.15072-1-arunisaac@systemreboot.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) 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/cmake.scm (cmake): Update to 3.10.2. Re-indent. [source]: Remove cmake-fix-tests patch. Do not remove bundled cmlibuv. [arguments]: Replace system* with invoke. [inputs]: Add rhash. Sort. [home-page]: Update URL. * gnu/packages/patches/cmake-fix-tests.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Unregister it. --- gnu/local.mk | 1 - gnu/packages/cmake.scm | 153 ++++++++++++++++------------- gnu/packages/patches/cmake-fix-tests.patch | 120 ---------------------- 3 files changed, 83 insertions(+), 191 deletions(-) delete mode 100644 gnu/packages/patches/cmake-fix-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3f0023a2f..94803a39f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -583,7 +583,6 @@ dist_patch_DATA = \ %D%/packages/patches/clisp-remove-failing-test.patch \ %D%/packages/patches/clucene-pkgconfig.patch \ %D%/packages/patches/clx-remove-demo.patch \ - %D%/packages/patches/cmake-fix-tests.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..cbe1ed701 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2018 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,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) @@ -40,57 +42,65 @@ (define-public cmake (package (name "cmake") - (version "3.7.2") + (version "3.10.2") (source (origin - (method url-fetch) - (uri (string-append "https://www.cmake.org/files/v" - (version-major+minor version) - "/cmake-" version ".tar.gz")) - (sha256 - (base32 - "1q6a60695prpzzsmczm2xrgxdb61fyjznb04dr6yls6iwv24c4nw")) - (patches (search-patches "cmake-fix-tests.patch")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Drop bundled software. - (with-directory-excursion "Utilities" - (for-each delete-file-recursively - '("cmbzip2" - ;"cmcompress" - "cmcurl" - "cmexpat" - ;"cmjsoncpp" - ;"cmlibarchive" - "cmliblzma" - "cmlibuv" - "cmzlib")) - #t))))) + (method url-fetch) + (uri (string-append "https://www.cmake.org/files/v" + (version-major+minor version) + "/cmake-" version ".tar.gz")) + (sha256 + (base32 + "12r1ldq4l032d6f5gc22dlayck4cr29cczqsl9xf0vdm9anzml40")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Drop bundled software. + (with-directory-excursion "Utilities" + (for-each delete-file-recursively + '("cmbzip2" + ;; "cmcompress" + "cmcurl" + "cmexpat" + ;; "cmjsoncpp" + ;; "cmlibarchive" + "cmliblzma" + ;; "cmlibuv" + "cmzlib")) + #t))))) (build-system gnu-build-system) (arguments `(#:test-target "test" + #:make-flags + (let ((skipped-tests + (list "CTestTestUpload" ; This test requires network access. + ;; These tests fail. + "CTestTestSubdir" + "CMake.String" + "CTestCoverageCollectGCOV" + "BundleUtilities"))) + (list + (string-append + "ARGS=--exclude-regex ^\\(" (string-join skipped-tests "\\|") "\\)$"))) #:phases (modify-phases %standard-phases (add-before 'configure 'patch-bin-sh (lambda _ - ;; Replace "/bin/sh" by the right path in... a lot of - ;; files. - (substitute* - '("Modules/CompilerId/Xcode-3.pbxproj.in" - "Modules/CompilerId/Xcode-1.pbxproj.in" - "Modules/CompilerId/Xcode-2.pbxproj.in" - "Modules/CPack.RuntimeScript.in" - "Source/cmakexbuild.cxx" - "Source/cmGlobalXCodeGenerator.cxx" - "Source/CTest/cmCTestBatchTestHandler.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") + ;; 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/CTest/cmCTestBatchTestHandler.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)) + #t)) (add-before 'configure 'set-paths (lambda _ ;; Help cmake's bootstrap process to find system libraries @@ -101,43 +111,46 @@ (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (zero? (system* - "./configure" - (string-append "--prefix=" out) - "--system-libs" - "--no-system-jsoncpp" ; FIXME: Circular dependency. - ;; By default, the man pages and other docs land - ;; in PREFIX/man and PREFIX/doc, but we want them - ;; in share/{man,doc}. Note that unlike - ;; autoconf-generated configure scripts, cmake's - ;; configure prepends "PREFIX/" to what we pass - ;; to --mandir and --docdir. - "--mandir=share/man" - ,(string-append - "--docdir=share/doc/cmake-" - (version-major+minor version))))))) + (invoke + "./configure" + (string-append "--prefix=" out) + "--system-libs" + "--no-system-jsoncpp" ; FIXME: Circular dependency. + ;; By default, the man pages and other docs land + ;; in PREFIX/man and PREFIX/doc, but we want them + ;; in share/{man,doc}. Note that unlike + ;; autoconf-generated configure scripts, cmake's + ;; configure prepends "PREFIX/" to what we pass + ;; to --mandir and --docdir. + "--mandir=share/man" + ,(string-append + "--docdir=share/doc/cmake-" + (version-major+minor version))) + #t))) (add-before 'check 'set-test-environment (lambda _ ;; Get verbose output from failed tests. (setenv "CTEST_OUTPUT_ON_FAILURE" "TRUE") + ;; Parallel tests fail in the 3.10.2 release. ;; Run tests in parallel. - (setenv "CTEST_PARALLEL_LEVEL" - (number->string (parallel-job-count))) + ;; (setenv "CTEST_PARALLEL_LEVEL" + ;; (number->string (parallel-job-count))) #t))))) (inputs - `(("file" ,file) - ("curl" ,curl) - ("zlib" ,zlib) - ("expat" ,expat) - ("bzip2" ,bzip2) - ("ncurses" ,ncurses) ; required for ccmake - ("libuv" ,libuv) - ("libarchive" ,libarchive))) + `(("bzip2" ,bzip2) + ("curl" ,curl) + ("expat" ,expat) + ("file" ,file) + ("libarchive" ,libarchive) + ("libuv" ,libuv) + ("ncurses" ,ncurses) ; required for ccmake + ("rhash" ,rhash) + ("zlib" ,zlib))) (native-search-paths (list (search-path-specification - (variable "CMAKE_PREFIX_PATH") - (files '(""))))) - (home-page "https://www.cmake.org/") + (variable "CMAKE_PREFIX_PATH") + (files '(""))))) + (home-page "https://cmake.org/") (synopsis "Cross-platform build system") (description "CMake is a family of tools designed to build, test and package software. diff --git a/gnu/packages/patches/cmake-fix-tests.patch b/gnu/packages/patches/cmake-fix-tests.patch deleted file mode 100644 index 732b0023a..000000000 --- a/gnu/packages/patches/cmake-fix-tests.patch +++ /dev/null @@ -1,120 +0,0 @@ -From af0a62dadfb3db25880bc653e2e4c97435a604c9 Mon Sep 17 00:00:00 2001 -From: Efraim Flashner -Date: Mon, 29 Aug 2016 20:07:58 +0300 -Subject: [PATCH] cmake-fix-tests - ---- - Tests/CMakeLists.txt | 83 ++++++++++++++++++++++++++++------------------------ - 1 file changed, 44 insertions(+), 39 deletions(-) - -diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt -index f21e430..56014a2 100644 ---- a/Tests/CMakeLists.txt -+++ b/Tests/CMakeLists.txt -@@ -416,10 +416,12 @@ if(BUILD_TESTING) - endif() - - # run test for BundleUtilities on supported platforms/compilers -- if(MSVC OR -- MINGW OR -- CMAKE_SYSTEM_NAME MATCHES "Linux" OR -- CMAKE_SYSTEM_NAME MATCHES "Darwin") -+# if(MSVC OR -+# MINGW OR -+# CMAKE_SYSTEM_NAME MATCHES "Linux" OR -+# CMAKE_SYSTEM_NAME MATCHES "Darwin") -+# This test fails on Guix: skip it. -+ if(FALSE) - if(NOT "${CMAKE_GENERATOR}" STREQUAL "Watcom WMake") - - add_test(BundleUtilities ${CMAKE_CTEST_COMMAND} -@@ -2481,30 +2483,32 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release - PASS_REGULAR_EXPRESSION "Could not find executable" - FAIL_REGULAR_EXPRESSION "SegFault") - -- configure_file( -- "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in" -- "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -- @ONLY ESCAPE_QUOTES) -- add_test(CTestTestUpload ${CMAKE_CTEST_COMMAND} -- -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V -- --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log" -- ) -- set_tests_properties(CTestTestUpload PROPERTIES -- PASS_REGULAR_EXPRESSION "Upload\\.xml") -- -- configure_file( -- "${CMake_SOURCE_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake.in" -- "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake" -- @ONLY ESCAPE_QUOTES) -- add_test(CTestCoverageCollectGCOV ${CMAKE_CTEST_COMMAND} -- -C \${CTEST_CONFIGURATION_TYPE} -- -S "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake" -VV -- --output-log "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/testOut.log" -- ) -- set_tests_properties(CTestCoverageCollectGCOV PROPERTIES -- PASS_REGULAR_EXPRESSION -- "PASSED with correct output.*Testing/CoverageInfo/main.cpp.gcov") -- set_property(TEST CTestCoverageCollectGCOV PROPERTY ENVIRONMENT CTEST_PARALLEL_LEVEL=) -+# This test requires network connectivity: skip it. -+# configure_file( -+# "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in" -+# "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -+# @ONLY ESCAPE_QUOTES) -+# add_test(CTestTestUpload ${CMAKE_CTEST_COMMAND} -+# -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V -+# --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log" -+# ) -+# set_tests_properties(CTestTestUpload PROPERTIES -+# PASS_REGULAR_EXPRESSION "Upload\\.xml") -+ -+# This test times out -+# configure_file( -+# "${CMake_SOURCE_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake.in" -+# "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake" -+# @ONLY ESCAPE_QUOTES) -+# add_test(CTestCoverageCollectGCOV ${CMAKE_CTEST_COMMAND} -+# -C \${CTEST_CONFIGURATION_TYPE} -+# -S "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake" -VV -+# --output-log "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/testOut.log" -+# ) -+# set_tests_properties(CTestCoverageCollectGCOV PROPERTIES -+# PASS_REGULAR_EXPRESSION -+# "PASSED with correct output.*Testing/CoverageInfo/main.cpp.gcov") -+# set_property(TEST CTestCoverageCollectGCOV PROPERTY ENVIRONMENT CTEST_PARALLEL_LEVEL=) - - configure_file( - "${CMake_SOURCE_DIR}/Tests/CTestTestEmptyBinaryDirectory/test.cmake.in" -@@ -2860,17 +2864,18 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release - set_tests_properties(CTestTestStopTime PROPERTIES - PASS_REGULAR_EXPRESSION "The stop time has been passed") - -- configure_file( -- "${CMake_SOURCE_DIR}/Tests/CTestTestSubdir/test.cmake.in" -- "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/test.cmake" -- @ONLY ESCAPE_QUOTES) -- add_test(CTestTestSubdir ${CMAKE_CTEST_COMMAND} -- -S "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/test.cmake" -V -- --output-log "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/testOutput.log" -- ) -- #make sure all 3 subdirs were added -- set_tests_properties(CTestTestSubdir PROPERTIES -- PASS_REGULAR_EXPRESSION "0 tests failed out of 3") -+# This test fails to build 2 of the 3 tests -+# configure_file( -+# "${CMake_SOURCE_DIR}/Tests/CTestTestSubdir/test.cmake.in" -+# "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/test.cmake" -+# @ONLY ESCAPE_QUOTES) -+# add_test(CTestTestSubdir ${CMAKE_CTEST_COMMAND} -+# -S "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/test.cmake" -V -+# --output-log "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/testOutput.log" -+# ) -+# #make sure all 3 subdirs were added -+# set_tests_properties(CTestTestSubdir PROPERTIES -+# PASS_REGULAR_EXPRESSION "0 tests failed out of 3") - - configure_file( - "${CMake_SOURCE_DIR}/Tests/CTestTestTimeout/test.cmake.in" --- -2.9.3 - -- 2.15.1 From unknown Wed Aug 20 01:19:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#30390] [PATCH 1/3] gnu: Add rhash. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Feb 2018 17:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Arun Isaac , 30390@debbugs.gnu.org Received: via spool by 30390-submit@debbugs.gnu.org id=B30390.151914868925552 (code B ref 30390); Tue, 20 Feb 2018 17:45:02 +0000 Received: (at 30390) by debbugs.gnu.org; 20 Feb 2018 17:44:49 +0000 Received: from localhost ([127.0.0.1]:53122 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eoByD-0006e3-0O for submit@debbugs.gnu.org; Tue, 20 Feb 2018 12:44:49 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:38607) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eoByB-0006dv-HV for 30390@debbugs.gnu.org; Tue, 20 Feb 2018 12:44:47 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 5E0B12183D; Tue, 20 Feb 2018 12:44:47 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Tue, 20 Feb 2018 12:44:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= 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=h450HCBhxWxQKKXbATWhcLqVkpZmMPEjynR+izyEQP4=; b=mleNHFCB u2sOP54mGkyH9Sx3odpPOUwCyWK0fFKa9AxjqBw3EuTx2SVbo++rB//vQxfhXwsw axKGucvrioXM+3TMt4XPPqi3flLyMN41a1EiK2K4R/5dsBMLe8xfXKL2l1bV7TWV iShuvdGGFPmq7J5hZaTuzKIoDF4xAEZ3WL0xMauO8OVeEXn5zNGoKa6LBjHTgBGa ybFHaGzhuafNJ2CX+mo3iiufOHQx5Hpxg9a3xfUsQKDEnko1ac/Q+tLrNi1Ml991 J5KWhql21heURBDRW1qmvXXL25LQo1DdcOHLGORk4S0Z3mD+kh1OV1or0QdkxjvT Y9CzmQwZxd++MA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=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=h450HCBhxWxQKKXbATWhcLqVkpZmM PEjynR+izyEQP4=; b=KVmcijrpZjsrMa9XYE0lS1uWseFE9XIDJJwaYE221JmD0 D+/bxbobd7LTya2ZDhQGRSsjLxAPOu2rjzmnOz2+FkC83ReXEx7aOsh3KmhMbeZq jTIQOjVru3CTrx24QqArxRRS83ULPkfRFfMW9y6yiO2qfYkF7GHrLQpRJ3EA2dah JArpKemBXoA76cdnY9EUbl/B0quiMKbMYXoSn4ZWuexDxe/5S0KvhXVOPkdfcj9s nCo/9WnXChRtwWHnzBdw9WAF65CIwkhjbNSR3eO7s++WPiY57LkwfX8td9mKdoYR 4FLUkKAmevjONvfnK1IFXfZTj7b1ClmH/ef/bMEdw== X-ME-Sender: Received: from localhost (cm-84.211.227.176.getinternet.no [84.211.227.176]) by mail.messagingengine.com (Postfix) with ESMTPA id D77DA7E142; Tue, 20 Feb 2018 12:44:46 -0500 (EST) From: Marius Bakke In-Reply-To: <20180208121747.15072-1-arunisaac@systemreboot.net> References: <20180208121323.14840-1-arunisaac@systemreboot.net> <20180208121747.15072-1-arunisaac@systemreboot.net> User-Agent: Notmuch/0.26 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) Date: Tue, 20 Feb 2018 18:44:45 +0100 Message-ID: <87po4zblo2.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-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 Arun Isaac writes: > * gnu/packages/crypto.scm (rhash): New variable. [...] > +(define-public rhash > + (package > + (name "rhash") > + (version "1.3.5") > + (source > + (origin > + (method url-fetch) > + (uri (string-append "https://github.com/rhash/RHash/archive/v" > + version ".tar.gz")) > + (file-name (string-append name "-" version ".tar.gz")) > + (sha256 > + (base32 > + "0bhz3xdl6r06k1bqigdjz42l31iqz2qdpg7zk316i7p2ra56iq4q")))) > + (build-system gnu-build-system) > + (arguments > + `(#:make-flags (list "CC=gcc" > + (string-append "PREFIX=" %output)) > + #:test-target "test" > + #:phases > + (modify-phases %standard-phases > + (replace 'configure > + (lambda* (#:key outputs #:allow-other-keys) > + (substitute* "Makefile" > + (("\\$\\(DESTDIR\\)/etc") > + (string-append (assoc-ref outputs "out") "/etc"))) > + #t)) > + (add-after 'build 'build-library > + (lambda* (#:key outputs make-flags #:allow-other-keys) > + (apply invoke "make" "lib-shared" make-flags) > + #t)) > + (add-after 'install 'install-library > + (lambda* (#:key outputs make-flags #:allow-other-keys) > + (apply invoke "make" "install-lib-shared" make-flags) > + (apply invoke > + "make" "-C" "librhash" "install-headers" > + "install-so-link" make-flags) > + #t)) > + (add-after 'check 'check-library > + (lambda* (#:key outputs make-flags #:allow-other-keys) > + (apply invoke "make" "test-shared-lib" make-flags) > + #t))))) I think the "outputs" key is unnecessary in all these phases. Also, (invoke ...) returns #t on successful execution, so no need to add an extra #t at the end. > + (home-page "https://sourceforge.net/projects/rhash/") > + (synopsis "Utility for computing hash sums") > + (description "RHash is a console utility for calculation and verification > +of magnet links and a wide range of hash sums like CRC32, MD4, MD5, SHA1, > +SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R > +34.11-94, RIPEMD-160, HAS-160, EDON-R, Whirlpool and Snefru.") > + (license (license:fsf-free "file://COPYING")))) Has this license been approved by the FSF? If so please add a URL. Otherwise I'd go with "non-copyleft" here. Otherwise this LGTM. I guess this can go to "master" in case it's needed before the CMake update. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlqMXo0ACgkQoqBt8qM6 VPpohwgAobqwHWyj4o06IsMHo8Th7z7RSqO/I/2gymxYy13auhmrS/7PhumNu4OF CbobSvl6a3JrJqm0ecXuNGS2O/wYddvypch7Bc7jgSNhJTDoHUxn36KAhqlPVXr9 vVzogKgkgtRFP+WFBTTzbKpb2kg1hoBxJ/M0I/Y153QsmZdT748XSNSYhvUDRFbX guaRILOr4ZIsodlrbu9iRiVmLcd4iRYI2IeCgO90efERWiJv1wY3NzwERDzLpOV/ cvxGzmDIt2fAfiDmnp5W4gGSU+vc0uK2kpRZyaStmV2C4NstI9uaDa5LFJeOzfq3 aiVUVyzQK6ZVPb7HQ2JpkjndnVvMTw== =aoV/ -----END PGP SIGNATURE----- --=-=-=-- From unknown Wed Aug 20 01:19:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#30390] [PATCH 2/3] gnu: libuv: Update to 1.19.1. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Feb 2018 17:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Arun Isaac , 30390@debbugs.gnu.org Received: via spool by 30390-submit@debbugs.gnu.org id=B30390.151914878825747 (code B ref 30390); Tue, 20 Feb 2018 17:47:01 +0000 Received: (at 30390) by debbugs.gnu.org; 20 Feb 2018 17:46:28 +0000 Received: from localhost ([127.0.0.1]:53128 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eoBzo-0006hD-Dh for submit@debbugs.gnu.org; Tue, 20 Feb 2018 12:46:28 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:52987) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eoBzn-0006h5-4T for 30390@debbugs.gnu.org; Tue, 20 Feb 2018 12:46:27 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 7309C20CEB; Tue, 20 Feb 2018 12:46:25 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Tue, 20 Feb 2018 12:46:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= 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=QhgnfSkx3BIlP1+9oWe8QTZtb7gb/C1GebPp7Ea0vNM=; b=FkaPRMDR LhII4AAC/IcKvZ4tQYJ8EMSzt8OMTMS6c5FHbLphFO8cEM0787/ItSAeXdlssO7n jGKG7FlcYTDtb2axIYs3XhF/f1WxWX/ayUTy2CMS+/+MFnEkm3CV3D5D8/O5WPoz XqpfYg4cxB+GBPjMcFWWuKJoXS2sss6OMBInb6q0XiPMhRA3WXmvJifTmpgE6xcw VcKYhcROTkelFHC5/2Wi/FBoIpJNG0zExqsvC4Ps8HvAsml7VcyLEdY7/0X+sCdY B3vtfUfX6JggTqmoU6z6OgpWZTl+rzmyaOWOrQsKEpiZPHXkZvUgm0YmWJPyLVhk BeY4R4sWuAQwNw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=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=QhgnfSkx3BIlP1+9oWe8QTZtb7gb/ C1GebPp7Ea0vNM=; b=OoMmYsu1N+4k23gaXcPR6alKZOrY+m8XKIA54rdLAScr/ xxWVRIzDRA5/28pYN3W5IxDUtGrEljeFWGiEGoQX+JtPig9ICCnB5kNJGG8lsFQK 69yRJziPyU2PNluYk/OF27xqxVL/rGCdxrK7tQQr6izK1QBtUlgowc4cO9H6+kUC gGmUQIUsiPJvPjkiWhtaDKCpySztKUQFgHQfilVvL8CczcGL89pN0o9cEKWbF3+b YK34wUhCueHmMp1ugGNj+tQE4D2oQ+bqgUhIlkfWFTiEWSViQsWhY9xrf1Ay/tKI rrb05DMcVVK8KL8F3oQEUBeesCRBUimB9uCU3h+nw== X-ME-Sender: Received: from localhost (cm-84.211.227.176.getinternet.no [84.211.227.176]) by mail.messagingengine.com (Postfix) with ESMTPA id ED1B57E0FD; Tue, 20 Feb 2018 12:46:24 -0500 (EST) From: Marius Bakke In-Reply-To: <20180208121747.15072-2-arunisaac@systemreboot.net> References: <20180208121747.15072-1-arunisaac@systemreboot.net> <20180208121747.15072-2-arunisaac@systemreboot.net> User-Agent: Notmuch/0.26 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) Date: Tue, 20 Feb 2018 18:46:23 +0100 Message-ID: <87mv03bllc.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-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 Arun Isaac writes: > * gnu/packages/libevent.scm (libuv): Update to 1.19.1. > [arguments]: Use modify-phases. This is already in core-updates, sorry for the duplicate work! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlqMXu8ACgkQoqBt8qM6 VPoetwgAvN8IUMwGo1vLmrS+sJIiyNtQLRxmJBzuPD2vl+yyhgZAOuLzPR9Tn3T8 ioxU162Gal+tt+RFvpEqd2SrgAzQump6mIJ1WglzDhnsbVY6aRn8mpXMl7I72RZP yfcJxMpyiVe+v6Bq7qiH6gELrwmWn5zzgY3rOUeHUIDTrQxq8Q92TlbovwSQvwjU o6AFXh6mI4GWnR3l+yKxb1KvX61Q1blSbyAoKViTickye6BegEkscrTi2cfxJhuk OcIJ6RH5PVfEUTQETnEhu/cmvjMgIQt2zle5LvmTm/izTIzcERa2lKjZuxyZ8Cus BnJOeASLHf++7H1M89AWPrdOOIe36w== =4eNm -----END PGP SIGNATURE----- --=-=-=-- From unknown Wed Aug 20 01:19:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#30390] [PATCH 3/3] gnu: cmake: Update to 3.10.2. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Feb 2018 17:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Arun Isaac , 30390@debbugs.gnu.org Received: via spool by 30390-submit@debbugs.gnu.org id=B30390.151914929726515 (code B ref 30390); Tue, 20 Feb 2018 17:55:01 +0000 Received: (at 30390) by debbugs.gnu.org; 20 Feb 2018 17:54:57 +0000 Received: from localhost ([127.0.0.1]:53140 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eoC80-0006ta-QW for submit@debbugs.gnu.org; Tue, 20 Feb 2018 12:54:57 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:42697) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eoC7x-0006tQ-CO for 30390@debbugs.gnu.org; Tue, 20 Feb 2018 12:54:55 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 0BBB520D22; Tue, 20 Feb 2018 12:54:53 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Tue, 20 Feb 2018 12:54:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= 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=LEX2G32cOYacOf3vgppCBvFq0FosruYNfxt2LAKgXaw=; b=m3ei0jI7 D7VwMVhybR53JAo/paDKLU9954KrXgOagvBSSMKJ/23ZsagIMh8IcOHof49Xej/t R3J7XU2AMjAO1hJlTCWmNwLxuRO78jeOv800VaY/Y9KNegK8JhptQlCKJGUWVVQq WE4eURiLsIMxdvIWTQCnr07UbezWB3dafBDmilG5KNQmccDT7CrqDxwnuo0r6uDG 3YH7Lf61Ay78HIO3Y9d7agzOzo9429EHRLnsR2EKMIZRJNeUEpWlURloKpU1HtjP EzPiMHGrvUpNyUNCaSz0ggRc7ftbb4FpIteJDC+VfsUlR/ehTk7GjDhZ4VtTvr4L 9/hBFoP4ZTmrKg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=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=LEX2G32cOYacOf3vgppCBvFq0Fosr uYNfxt2LAKgXaw=; b=hDsJybD9Vcjb7Pm8j4JD3rEPLw0Uto81xmE6uVvfNzTHt U3vJ7waz1jLN0JoqwGwjJPren61E7X79TbJzIIs3jSRiYJYi76h92zhTgxIBJdpQ Na68owcdyI2gdzvawOlfDFkZXOlcPqFFP2MSWnWe2k4tMOZ+c8duEY8h+hC3FStt gBCvenTag3m65chmoNZsKtOuVS+yk/pFC5MnkHRvrkkvnORhctXXgjXtHOsamovt okTt0GmIUMyW3y8yNiBr31dVdYjio5b0JHR5L7R+T/XjIjxPLfrD9iunI6Q/KxTu 3+z2WXmryJQ5KivE24646LSVN0nnoro9/PqCN7mIg== X-ME-Sender: Received: from localhost (cm-84.211.227.176.getinternet.no [84.211.227.176]) by mail.messagingengine.com (Postfix) with ESMTPA id 7C8F47E0FD; Tue, 20 Feb 2018 12:54:52 -0500 (EST) From: Marius Bakke In-Reply-To: <20180208121747.15072-3-arunisaac@systemreboot.net> References: <20180208121747.15072-1-arunisaac@systemreboot.net> <20180208121747.15072-3-arunisaac@systemreboot.net> User-Agent: Notmuch/0.26 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) Date: Tue, 20 Feb 2018 18:54:50 +0100 Message-ID: <87k1v7bl79.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-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 Arun Isaac writes: > * gnu/packages/cmake.scm (cmake): Update to 3.10.2. Re-indent. > [source]: Remove cmake-fix-tests patch. > Do not remove bundled cmlibuv. > [arguments]: Replace system* with invoke. > [inputs]: Add rhash. Sort. > [home-page]: Update URL. > * gnu/packages/patches/cmake-fix-tests.patch: Delete file. > * gnu/local.mk (dist_patch_DATA): Unregister it. [...] > @@ -31,6 +32,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) > @@ -40,57 +42,65 @@ > (define-public cmake > (package > (name "cmake") > - (version "3.7.2") > + (version "3.10.2") > (source (origin > - (method url-fetch) > - (uri (string-append "https://www.cmake.org/files/v" > - (version-major+minor version) > - "/cmake-" version ".tar.gz")) > - (sha256 > - (base32 > - "1q6a60695prpzzsmczm2xrgxdb61fyjznb04dr6yls6iwv24c4nw")) > - (patches (search-patches "cmake-fix-tests.patch")) > - (modules '((guix build utils))) > - (snippet > - '(begin > - ;; Drop bundled software. > - (with-directory-excursion "Utilities" > - (for-each delete-file-recursively > - '("cmbzip2" > - ;"cmcompress" > - "cmcurl" > - "cmexpat" > - ;"cmjsoncpp" > - ;"cmlibarchive" > - "cmliblzma" > - "cmlibuv" > - "cmzlib")) > - #t))))) > + (method url-fetch) > + (uri (string-append "https://www.cmake.org/files/v" > + (version-major+minor version) > + "/cmake-" version ".tar.gz")) > + (sha256 > + (base32 > + "12r1ldq4l032d6f5gc22dlayck4cr29cczqsl9xf0vdm9anzml40")) > + (modules '((guix build utils))) > + (snippet > + '(begin > + ;; Drop bundled software. > + (with-directory-excursion "Utilities" > + (for-each delete-file-recursively > + '("cmbzip2" > + ;; "cmcompress" > + "cmcurl" > + "cmexpat" > + ;; "cmjsoncpp" > + ;; "cmlibarchive" > + "cmliblzma" > + ;; "cmlibuv" > + "cmzlib")) > + #t))))) > (build-system gnu-build-system) > (arguments > `(#:test-target "test" > + #:make-flags > + (let ((skipped-tests > + (list "CTestTestUpload" ; This test requires network access. > + ;; These tests fail. > + "CTestTestSubdir" > + "CMake.String" > + "CTestCoverageCollectGCOV" > + "BundleUtilities"))) Please transfer the comments about the test failures from "cmake-fix-tests.patch" to this section. Other than that this is OK for core-updates. Side note: I'd prefer to have the indendation change in a separate commit, since it's very difficult to read this diff. But I understand that it would be a hassle to change it now, so OK. :-) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlqMYOsACgkQoqBt8qM6 VPpbMwf/Qh8gTvdgRFdvpFvI80Q12FyDRSWwtiPXFlEROppiRwScVrfQO9HyR1uc nH8NcvMD5JbhsMiIFLskvsLBUuOmD5wwTVevBs55I6ZqACnXrX7v5NUwNiVhsy/F Ng/yqF4Sg0kD0f9ABFYp03r3j+B8Yp848wEODBu6t9BW6rCJrY/yswROvl2BoN33 NgOr3tcPNIEGQ5KE59lynx/WyYBX1id6a3Rhrkv/LqGhf1t/VwKzUwMu/Tyyv80R ZIMnRX9sQIg0/L39x+IAqexNKiKjtJwZYFZ8gg97PIvZxZ1/2+Sy9eYJxuh3ax6i xvIyLaoa+sIZhipKk3kmkFqzpsKnOA== =PrHp -----END PGP SIGNATURE----- --=-=-=-- From unknown Wed Aug 20 01:19:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#30390] [PATCH 1/3] gnu: Add rhash. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2018 14:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke , 30390@debbugs.gnu.org Received: via spool by 30390-submit@debbugs.gnu.org id=B30390.151931056531425 (code B ref 30390); Thu, 22 Feb 2018 14:43:02 +0000 Received: (at 30390) by debbugs.gnu.org; 22 Feb 2018 14:42:45 +0000 Received: from localhost ([127.0.0.1]:55508 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eos55-0008Al-6p for submit@debbugs.gnu.org; Thu, 22 Feb 2018 09:42:44 -0500 Received: from vultr.systemreboot.net ([45.77.148.100]:57568) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eos52-0008AY-Qd for 30390@debbugs.gnu.org; Thu, 22 Feb 2018 09:42:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Type:MIME-Version:Message-ID:Date: References:In-Reply-To:Subject:To:From:Sender:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=wlGntDrZs+BQrEk63SQ3AbtGCalPUO0wV+QdcWAT0YQ=; b=MwVnq87/cI8fCDctLD/vHFoKz j0quXJRh3iBxe/3ixaeNdri6FjuxhMdnetYzCoeJGMIZJeykJcE01m+pNmxQDBrczRM38QxIgmzOT czD3trN2/oCSt2sPgCUflacwZAkcQn7YfvrfYOyN2SWrZFtyVVH/KqVEhaTd1z0CAT6oo=; Received: from [61.3.25.134] (helo=steel) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90) (envelope-from ) id 1eos4s-00074o-QW; Thu, 22 Feb 2018 20:12:30 +0530 From: Arun Isaac In-Reply-To: <87po4zblo2.fsf@fastmail.com> References: <20180208121323.14840-1-arunisaac@systemreboot.net> <20180208121747.15072-1-arunisaac@systemreboot.net> <87po4zblo2.fsf@fastmail.com> Date: Thu, 22 Feb 2018 20:12:12 +0530 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) 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 (/) Marius Bakke writes: > Arun Isaac writes: > >> * gnu/packages/crypto.scm (rhash): New variable. > > I guess this can go to "master" in case it's needed before the CMake > update. I'll make the changes and push rhash to master. I'm building the other packages, but it's taking a while. So, do bear with me. No problem about the cmake reindent. I'll separate it out as a different patch. Also, it looks like the sqlite package is broken. Upstream has changed the source URL from https://sqlite.org/2017/sqlite-autoconf-3220000.tar.gz to https://sqlite.org/2018/sqlite-autoconf-3220000.tar.gz Notice the change in the year: 2017 -> 2018. I'll send a patch for this as well. From unknown Wed Aug 20 01:19:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#30390] [PATCH 1/3] gnu: Add rhash. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2018 14:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Arun Isaac , 30390@debbugs.gnu.org Received: via spool by 30390-submit@debbugs.gnu.org id=B30390.151931090631962 (code B ref 30390); Thu, 22 Feb 2018 14:49:02 +0000 Received: (at 30390) by debbugs.gnu.org; 22 Feb 2018 14:48:26 +0000 Received: from localhost ([127.0.0.1]:55514 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eosAc-0008JR-Bw for submit@debbugs.gnu.org; Thu, 22 Feb 2018 09:48:26 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:33297) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eosAZ-0008JJ-Le for 30390@debbugs.gnu.org; Thu, 22 Feb 2018 09:48:24 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 50D3F213D0; Thu, 22 Feb 2018 09:48:23 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Thu, 22 Feb 2018 09:48:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= 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=WFNhZ87WYqNUvKaGdRiANYL+3kpOfazhcFiyVtLwHhU=; b=gQPZuNM6 REkXtLFqC8vpIn2D/wywTuGvBGg2O7OPd3VCIsK+pKl8vTur2/heRE94PH51g5XA nPkCFmsYQ7UfYSYZhdB6LdRNszTOeE6t+LrKXmU12OtJXlBqXVa1x55r1Q9xIoOS zKNnYQiai/VqVkTxwMy7YVUY6sk3Z36gGA1l80DIJF2L22bmgsuoAlAHFfgdXeYj 0sbcuE3s5QNoGqOo5rNNq/4Zriy1QNISEkltlTUGso0rt+Ih19MiAOSGsAOXg3If fMDWueRCv8vJjqZ1HnN3kLF8Z6xGXwiNNzXbt52HEJ6EwXyB/iPZhDTe/D6CYyPR B6PS/DRNxg4cWw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=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=WFNhZ87WYqNUvKaGdRiANYL+3kpOf azhcFiyVtLwHhU=; b=buTC6CfqlSdGA/jMMlPItgwLBPEb2W3p1yUOMBSvtd1Nj fYrOAlYyQDhfHE6PQHM+Yu8qwU53SnwDxjHFCxYqxni8PFTAtjNiJS/lB8HkTWtw /67uE+Csp821hUO2JRnJQbjbj4/cgIl8tU+d5l6kNIvYVJ59Bclx7Wbs2ufP0X7E wFHUusrB+1thB4zgTOP6dDjhypL5BoTbIeyRbhgZ2fTgRJ7wvMI3bY4KkGKLtA5Q bM6sz6B5DruF5j+yf8Z0XKpzcA6dnCvAb7PEMw3jFGIPqI+BTTZPV6Doa4Kcln/+ baXx28PFV2pWb9RHlQblTIM90faOh/OVYB21PAlTA== X-ME-Sender: Received: from localhost (cm-84.211.227.176.getinternet.no [84.211.227.176]) by mail.messagingengine.com (Postfix) with ESMTPA id 9FB997E4A8; Thu, 22 Feb 2018 09:48:22 -0500 (EST) From: Marius Bakke In-Reply-To: References: <20180208121323.14840-1-arunisaac@systemreboot.net> <20180208121747.15072-1-arunisaac@systemreboot.net> <87po4zblo2.fsf@fastmail.com> User-Agent: Notmuch/0.26 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) Date: Thu, 22 Feb 2018 15:48:20 +0100 Message-ID: <87po4x9j2j.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-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 Arun Isaac writes: > Marius Bakke writes: > >> Arun Isaac writes: >> >>> * gnu/packages/crypto.scm (rhash): New variable. >> >> I guess this can go to "master" in case it's needed before the CMake >> update. > > I'll make the changes and push rhash to master. Excellent. > > I'm building the other packages, but it's taking a while. So, do bear > with me. No problem about the cmake reindent. I'll separate it out as a > different patch. Great, thank you! > Also, it looks like the sqlite package is broken. Upstream has changed > the source URL from > https://sqlite.org/2017/sqlite-autoconf-3220000.tar.gz to > https://sqlite.org/2018/sqlite-autoconf-3220000.tar.gz > Notice the change in the year: 2017 -> 2018. I'll send a patch for this > as well. Oops, not sure how I missed that. Thanks for taking care of it. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlqO2DQACgkQoqBt8qM6 VPo6gwgAllg12otywF5Oh0qgt9qHCXGz30AlZTSCrnyPbl4LQhKH6FH/6qY97gw+ Kq5oZxuKG2dwZVfudMyNQQL9jXJk8wk64XCTtjsjK9ZS/bXqqNhCZHSo2BA5Vw+9 aErWX1UepYOS0jXw64ELSKm/Gw2bzUhC2UTPM+YbDv6c37UZ00eiYQZadtM9BjRw VpsleZSEDNM1KQvDshst0dFJqfbXManxetol3fNsB0HqJ1fquenzBBHTMBAQlB5c 24BT+v/kP541bR3/YQp6uL2AGYUOB/jWZf5HQRzPxTPMAGLL5tEcGJmWMOX7V9mH 8qhjwG3N9D23+eIS1TZ5xEh8mfTBGA== =4rT8 -----END PGP SIGNATURE----- --=-=-=-- From unknown Wed Aug 20 01:19:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#30390] [PATCH 1/3] gnu: sqlite: Fix source URI. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Feb 2018 13:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 30390@debbugs.gnu.org Cc: Arun Isaac , mbakke@fastmail.com Received: via spool by 30390-submit@debbugs.gnu.org id=B30390.151947775931461 (code B ref 30390); Sat, 24 Feb 2018 13:10:02 +0000 Received: (at 30390) by debbugs.gnu.org; 24 Feb 2018 13:09:19 +0000 Received: from localhost ([127.0.0.1]:58253 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epZZm-0008BK-75 for submit@debbugs.gnu.org; Sat, 24 Feb 2018 08:09:19 -0500 Received: from vultr.systemreboot.net ([45.77.148.100]:46342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epZZj-0008B2-RO for 30390@debbugs.gnu.org; Sat, 24 Feb 2018 08:09:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=NsjtJV1DdJVzWTYus9dWSr/YlCKkYc2Xu4KSBddMwho=; b=BzGYaWSd7VNNS7kk7oYd3jqDL lwm1Y74jqiv2T9JoObuzZKsxMn4yrLo1pzZK0Wk5Wnh8V/FuPfDD/8inDFtQ+jXjwzNIfx47E9+TS Z62DBdcnwovIvNlt8UI1qP568pqJ4RtwJrI306ltXu2Yv1W+3EzhcVnyp36jimwsABlfs=; Received: from [117.249.221.224] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) (envelope-from ) id 1epZZb-0000V9-Cn; Sat, 24 Feb 2018 18:39:07 +0530 From: Arun Isaac Date: Sat, 24 Feb 2018 18:38:47 +0530 Message-Id: <20180224130849.8886-2-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180224130849.8886-1-arunisaac@systemreboot.net> References: <20180224130849.8886-1-arunisaac@systemreboot.net> X-Spam-Score: -0.0 (/) 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 (sqlite)[source]: Fix source URI. --- gnu/packages/databases.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index d14fb6744..51e18d4a6 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1004,7 +1004,7 @@ for example from a shell script.") (map (cut string-pad <> 2 #\0) other-digits)) 6 #\0)))))) - (string-append "https://sqlite.org/2017/sqlite-autoconf-" + (string-append "https://sqlite.org/2018/sqlite-autoconf-" numeric-version ".tar.gz"))) (sha256 (base32 -- 2.15.1 From unknown Wed Aug 20 01:19:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#30390] [PATCH 3/3] gnu: cmake: Re-indent. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Feb 2018 13:10:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 30390@debbugs.gnu.org Cc: Arun Isaac , mbakke@fastmail.com Received: via spool by 30390-submit@debbugs.gnu.org id=B30390.151947776131486 (code B ref 30390); Sat, 24 Feb 2018 13:10:03 +0000 Received: (at 30390) by debbugs.gnu.org; 24 Feb 2018 13:09:21 +0000 Received: from localhost ([127.0.0.1]:58257 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epZZp-0008Bl-5q for submit@debbugs.gnu.org; Sat, 24 Feb 2018 08:09:21 -0500 Received: from vultr.systemreboot.net ([45.77.148.100]:46366) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epZZl-0008B8-Hb for 30390@debbugs.gnu.org; Sat, 24 Feb 2018 08:09:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=VSh9Zx6wX8Ed7qzQwTiivPqeWLa48oMluCHq1WrRCXA=; b=OLwbX0Yx7bJVPULAaE4yNIyxJ HCyYgUpVWad4Ho3uV9qEXuRgvUCA6o0Mx10JTmax8iqs4SaLCnnTErUxB0NOhIhAWKCV9ONYHGeDv Draey8c9Gh5O+8sjSozt+r486iwswBkNX29NuP2oWRiQiKE3nljhVAbt5tyAXJ7CIwolE=; Received: from [117.249.221.224] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) (envelope-from ) id 1epZZd-0000V9-Nl; Sat, 24 Feb 2018 18:39:10 +0530 From: Arun Isaac Date: Sat, 24 Feb 2018 18:38:49 +0530 Message-Id: <20180224130849.8886-4-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180224130849.8886-1-arunisaac@systemreboot.net> References: <20180224130849.8886-1-arunisaac@systemreboot.net> X-Spam-Score: -0.0 (/) 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/cmake.scm (cmake): Re-indent. --- gnu/packages/cmake.scm | 80 +++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 3f254b6f8..549a87621 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -44,29 +44,29 @@ (name "cmake") (version "3.10.2") (source (origin - (method url-fetch) - (uri (string-append "https://www.cmake.org/files/v" - (version-major+minor version) - "/cmake-" version ".tar.gz")) - (sha256 - (base32 - "12r1ldq4l032d6f5gc22dlayck4cr29cczqsl9xf0vdm9anzml40")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Drop bundled software. - (with-directory-excursion "Utilities" - (for-each delete-file-recursively - '("cmbzip2" - ;; "cmcompress" - "cmcurl" - "cmexpat" - ;; "cmjsoncpp" - ;; "cmlibarchive" - "cmliblzma" - ;; "cmlibuv" - "cmzlib")) - #t))))) + (method url-fetch) + (uri (string-append "https://www.cmake.org/files/v" + (version-major+minor version) + "/cmake-" version ".tar.gz")) + (sha256 + (base32 + "12r1ldq4l032d6f5gc22dlayck4cr29cczqsl9xf0vdm9anzml40")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Drop bundled software. + (with-directory-excursion "Utilities" + (for-each delete-file-recursively + '("cmbzip2" + ;; "cmcompress" + "cmcurl" + "cmexpat" + ;; "cmjsoncpp" + ;; "cmlibarchive" + "cmliblzma" + ;; "cmlibuv" + "cmzlib")) + #t))))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -75,8 +75,8 @@ (list "BundleUtilities" ; This test fails on Guix. "CTestTestSubdir" ; This test fails to build 2 of the 3 tests. "CMake.String" ; This test depends on clock being set to - ; current time, which is not the case in - ; the build environment. + ; current time, which is not the case in + ; the build environment. ;; These tests requires network access. "CTestCoverageCollectGCOV" "CTestTestUpload"))) @@ -87,22 +87,22 @@ (modify-phases %standard-phases (add-before 'configure '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/CTest/cmCTestBatchTestHandler.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") + ;; 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/CTest/cmCTestBatchTestHandler.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)) + #t)) (add-before 'configure 'set-paths (lambda _ ;; Help cmake's bootstrap process to find system libraries -- 2.15.1 From unknown Wed Aug 20 01:19:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#30390] [PATCH 0/3] Update cmake. References: <20180208121323.14840-1-arunisaac@systemreboot.net> In-Reply-To: <20180208121323.14840-1-arunisaac@systemreboot.net> Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Feb 2018 13:10:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 30390@debbugs.gnu.org Cc: Arun Isaac , mbakke@fastmail.com Received: via spool by 30390-submit@debbugs.gnu.org id=B30390.151947776131493 (code B ref 30390); Sat, 24 Feb 2018 13:10:03 +0000 Received: (at 30390) by debbugs.gnu.org; 24 Feb 2018 13:09:21 +0000 Received: from localhost ([127.0.0.1]:58259 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epZZp-0008Bn-GB for submit@debbugs.gnu.org; Sat, 24 Feb 2018 08:09:21 -0500 Received: from vultr.systemreboot.net ([45.77.148.100]:46346) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epZZj-0008B3-RE for 30390@debbugs.gnu.org; Sat, 24 Feb 2018 08:09:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Message-Id:Date:Subject:Cc:To:From:Sender: Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=WQFzdyQesu+dhCy6D1RGlMWYrM6a8dZCuZpfr56Gzs8=; b=GM43WEQaK4eP1B1Zt8gyKfPOPY R856x83yY2+1VskuoWVL8omR1+NM0sGAwwSQW00cZ9OQH45s+G7mqe/0VXfRg/mPzuwEJTdgsAz6W /4sVEArK5FxBqxmkDcEDAuUNouVIMY36A5Z3rBuT0IQ45Y8wwQgdl9faioWbESw0SILg=; Received: from [117.249.221.224] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) (envelope-from ) id 1epZZa-0000V9-4k; Sat, 24 Feb 2018 18:39:06 +0530 From: Arun Isaac Date: Sat, 24 Feb 2018 18:38:46 +0530 Message-Id: <20180224130849.8886-1-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.15.1 X-Spam-Score: -0.0 (/) 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 (/) I have added rhash and pushed it to master. Unfortunately, it became two commits, instead of just one, due to my sloppiness. All other changes you mentioned are done. Please find below the new patches. Test 92 of tar 1.30 fails on my system. I had to disable tar tests to get my cmake to build. I am not entirely sure if the test failure has got something to do with insufficient memory on my system. So, I'd like somebody to reproduce the problem before patching it. I'm a little confused now. Shouldn't I rebase the core-updates branch against master in order to have rhash? Wouldn't this disrupt the evaluation of core-updates on the build farm? Sorry I'm not very clear about how we handle core-updates. Arun Isaac (3): gnu: sqlite: Fix source URI. gnu: cmake: Update to 3.10.2. gnu: cmake: Re-indent. gnu/local.mk | 1 - gnu/packages/cmake.scm | 154 ++++++++++++++++------------- gnu/packages/databases.scm | 2 +- gnu/packages/patches/cmake-fix-tests.patch | 120 ---------------------- 4 files changed, 85 insertions(+), 192 deletions(-) delete mode 100644 gnu/packages/patches/cmake-fix-tests.patch -- 2.15.1 From unknown Wed Aug 20 01:19:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#30390] [PATCH 2/3] gnu: cmake: Update to 3.10.2. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Feb 2018 13:10:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 30390@debbugs.gnu.org Cc: Arun Isaac , mbakke@fastmail.com Received: via spool by 30390-submit@debbugs.gnu.org id=B30390.151947776931509 (code B ref 30390); Sat, 24 Feb 2018 13:10:04 +0000 Received: (at 30390) by debbugs.gnu.org; 24 Feb 2018 13:09:29 +0000 Received: from localhost ([127.0.0.1]:58261 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epZZp-0008Bu-OJ for submit@debbugs.gnu.org; Sat, 24 Feb 2018 08:09:29 -0500 Received: from vultr.systemreboot.net ([45.77.148.100]:46358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epZZk-0008B5-26 for 30390@debbugs.gnu.org; Sat, 24 Feb 2018 08:09:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=EE0fCP80EehrxJo43fCijdPCajoT6VBbIbKDEdY+1gQ=; b=bQFfRDoKNk5Iy8HINcHoXeC26c /SpuLhtO7AMCsMYTxIXZHZVZ/vzTB+kR+h3SyISgXaDWf/65jhEbMhlT3hycYLcvFT7xCblHqz3kw lHkBoIaJjxFXwNu97E5cXKY7IeOS4i9R5FGA8wlrI8tdvcMUMYuMYL3VTmDxpitSAaBA=; Received: from [117.249.221.224] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) (envelope-from ) id 1epZZc-0000V9-Hz; Sat, 24 Feb 2018 18:39:09 +0530 From: Arun Isaac Date: Sat, 24 Feb 2018 18:38:48 +0530 Message-Id: <20180224130849.8886-3-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180224130849.8886-1-arunisaac@systemreboot.net> References: <20180224130849.8886-1-arunisaac@systemreboot.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) 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/cmake.scm (cmake): Update to 3.10.2. [source]: Remove cmake-fix-tests patch. Do not remove bundled cmlibuv. [arguments]: Replace system* with invoke. [inputs]: Add rhash. Sort. [home-page]: Update URL. * gnu/packages/patches/cmake-fix-tests.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Unregister it. --- gnu/local.mk | 1 - gnu/packages/cmake.scm | 88 ++++++++++++--------- gnu/packages/patches/cmake-fix-tests.patch | 120 ----------------------------- 3 files changed, 51 insertions(+), 158 deletions(-) delete mode 100644 gnu/packages/patches/cmake-fix-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 82ae783db..d597d41f9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -588,7 +588,6 @@ dist_patch_DATA = \ %D%/packages/patches/clisp-remove-failing-test.patch \ %D%/packages/patches/clucene-pkgconfig.patch \ %D%/packages/patches/clx-remove-demo.patch \ - %D%/packages/patches/cmake-fix-tests.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..3f254b6f8 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2018 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,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) @@ -40,7 +42,7 @@ (define-public cmake (package (name "cmake") - (version "3.7.2") + (version "3.10.2") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -48,8 +50,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "1q6a60695prpzzsmczm2xrgxdb61fyjznb04dr6yls6iwv24c4nw")) - (patches (search-patches "cmake-fix-tests.patch")) + "12r1ldq4l032d6f5gc22dlayck4cr29cczqsl9xf0vdm9anzml40")) (modules '((guix build utils))) (snippet '(begin @@ -57,18 +58,31 @@ (with-directory-excursion "Utilities" (for-each delete-file-recursively '("cmbzip2" - ;"cmcompress" + ;; "cmcompress" "cmcurl" "cmexpat" - ;"cmjsoncpp" - ;"cmlibarchive" + ;; "cmjsoncpp" + ;; "cmlibarchive" "cmliblzma" - "cmlibuv" + ;; "cmlibuv" "cmzlib")) #t))))) (build-system gnu-build-system) (arguments `(#:test-target "test" + #:make-flags + (let ((skipped-tests + (list "BundleUtilities" ; This test fails on Guix. + "CTestTestSubdir" ; This test fails to build 2 of the 3 tests. + "CMake.String" ; This test depends on clock being set to + ; current time, which is not the case in + ; the build environment. + ;; These tests requires network access. + "CTestCoverageCollectGCOV" + "CTestTestUpload"))) + (list + (string-append + "ARGS=--exclude-regex ^\\(" (string-join skipped-tests "\\|") "\\)$"))) #:phases (modify-phases %standard-phases (add-before 'configure 'patch-bin-sh @@ -77,8 +91,6 @@ ;; files. (substitute* '("Modules/CompilerId/Xcode-3.pbxproj.in" - "Modules/CompilerId/Xcode-1.pbxproj.in" - "Modules/CompilerId/Xcode-2.pbxproj.in" "Modules/CPack.RuntimeScript.in" "Source/cmakexbuild.cxx" "Source/cmGlobalXCodeGenerator.cxx" @@ -101,43 +113,45 @@ (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (zero? (system* - "./configure" - (string-append "--prefix=" out) - "--system-libs" - "--no-system-jsoncpp" ; FIXME: Circular dependency. - ;; By default, the man pages and other docs land - ;; in PREFIX/man and PREFIX/doc, but we want them - ;; in share/{man,doc}. Note that unlike - ;; autoconf-generated configure scripts, cmake's - ;; configure prepends "PREFIX/" to what we pass - ;; to --mandir and --docdir. - "--mandir=share/man" - ,(string-append - "--docdir=share/doc/cmake-" - (version-major+minor version))))))) + (invoke + "./configure" + (string-append "--prefix=" out) + "--system-libs" + "--no-system-jsoncpp" ; FIXME: Circular dependency. + ;; By default, the man pages and other docs land + ;; in PREFIX/man and PREFIX/doc, but we want them + ;; in share/{man,doc}. Note that unlike + ;; autoconf-generated configure scripts, cmake's + ;; configure prepends "PREFIX/" to what we pass + ;; to --mandir and --docdir. + "--mandir=share/man" + ,(string-append + "--docdir=share/doc/cmake-" + (version-major+minor version)))))) (add-before 'check 'set-test-environment (lambda _ ;; Get verbose output from failed tests. (setenv "CTEST_OUTPUT_ON_FAILURE" "TRUE") + ;; Parallel tests fail in the 3.10.2 release. ;; Run tests in parallel. - (setenv "CTEST_PARALLEL_LEVEL" - (number->string (parallel-job-count))) + ;; (setenv "CTEST_PARALLEL_LEVEL" + ;; (number->string (parallel-job-count))) #t))))) (inputs - `(("file" ,file) - ("curl" ,curl) - ("zlib" ,zlib) - ("expat" ,expat) - ("bzip2" ,bzip2) - ("ncurses" ,ncurses) ; required for ccmake - ("libuv" ,libuv) - ("libarchive" ,libarchive))) + `(("bzip2" ,bzip2) + ("curl" ,curl) + ("expat" ,expat) + ("file" ,file) + ("libarchive" ,libarchive) + ("libuv" ,libuv) + ("ncurses" ,ncurses) ; required for ccmake + ("rhash" ,rhash) + ("zlib" ,zlib))) (native-search-paths (list (search-path-specification - (variable "CMAKE_PREFIX_PATH") - (files '(""))))) - (home-page "https://www.cmake.org/") + (variable "CMAKE_PREFIX_PATH") + (files '(""))))) + (home-page "https://cmake.org/") (synopsis "Cross-platform build system") (description "CMake is a family of tools designed to build, test and package software. diff --git a/gnu/packages/patches/cmake-fix-tests.patch b/gnu/packages/patches/cmake-fix-tests.patch deleted file mode 100644 index 732b0023a..000000000 --- a/gnu/packages/patches/cmake-fix-tests.patch +++ /dev/null @@ -1,120 +0,0 @@ -From af0a62dadfb3db25880bc653e2e4c97435a604c9 Mon Sep 17 00:00:00 2001 -From: Efraim Flashner -Date: Mon, 29 Aug 2016 20:07:58 +0300 -Subject: [PATCH] cmake-fix-tests - ---- - Tests/CMakeLists.txt | 83 ++++++++++++++++++++++++++++------------------------ - 1 file changed, 44 insertions(+), 39 deletions(-) - -diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt -index f21e430..56014a2 100644 ---- a/Tests/CMakeLists.txt -+++ b/Tests/CMakeLists.txt -@@ -416,10 +416,12 @@ if(BUILD_TESTING) - endif() - - # run test for BundleUtilities on supported platforms/compilers -- if(MSVC OR -- MINGW OR -- CMAKE_SYSTEM_NAME MATCHES "Linux" OR -- CMAKE_SYSTEM_NAME MATCHES "Darwin") -+# if(MSVC OR -+# MINGW OR -+# CMAKE_SYSTEM_NAME MATCHES "Linux" OR -+# CMAKE_SYSTEM_NAME MATCHES "Darwin") -+# This test fails on Guix: skip it. -+ if(FALSE) - if(NOT "${CMAKE_GENERATOR}" STREQUAL "Watcom WMake") - - add_test(BundleUtilities ${CMAKE_CTEST_COMMAND} -@@ -2481,30 +2483,32 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release - PASS_REGULAR_EXPRESSION "Could not find executable" - FAIL_REGULAR_EXPRESSION "SegFault") - -- configure_file( -- "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in" -- "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -- @ONLY ESCAPE_QUOTES) -- add_test(CTestTestUpload ${CMAKE_CTEST_COMMAND} -- -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V -- --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log" -- ) -- set_tests_properties(CTestTestUpload PROPERTIES -- PASS_REGULAR_EXPRESSION "Upload\\.xml") -- -- configure_file( -- "${CMake_SOURCE_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake.in" -- "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake" -- @ONLY ESCAPE_QUOTES) -- add_test(CTestCoverageCollectGCOV ${CMAKE_CTEST_COMMAND} -- -C \${CTEST_CONFIGURATION_TYPE} -- -S "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake" -VV -- --output-log "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/testOut.log" -- ) -- set_tests_properties(CTestCoverageCollectGCOV PROPERTIES -- PASS_REGULAR_EXPRESSION -- "PASSED with correct output.*Testing/CoverageInfo/main.cpp.gcov") -- set_property(TEST CTestCoverageCollectGCOV PROPERTY ENVIRONMENT CTEST_PARALLEL_LEVEL=) -+# This test requires network connectivity: skip it. -+# configure_file( -+# "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in" -+# "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -+# @ONLY ESCAPE_QUOTES) -+# add_test(CTestTestUpload ${CMAKE_CTEST_COMMAND} -+# -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V -+# --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log" -+# ) -+# set_tests_properties(CTestTestUpload PROPERTIES -+# PASS_REGULAR_EXPRESSION "Upload\\.xml") -+ -+# This test times out -+# configure_file( -+# "${CMake_SOURCE_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake.in" -+# "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake" -+# @ONLY ESCAPE_QUOTES) -+# add_test(CTestCoverageCollectGCOV ${CMAKE_CTEST_COMMAND} -+# -C \${CTEST_CONFIGURATION_TYPE} -+# -S "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake" -VV -+# --output-log "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/testOut.log" -+# ) -+# set_tests_properties(CTestCoverageCollectGCOV PROPERTIES -+# PASS_REGULAR_EXPRESSION -+# "PASSED with correct output.*Testing/CoverageInfo/main.cpp.gcov") -+# set_property(TEST CTestCoverageCollectGCOV PROPERTY ENVIRONMENT CTEST_PARALLEL_LEVEL=) - - configure_file( - "${CMake_SOURCE_DIR}/Tests/CTestTestEmptyBinaryDirectory/test.cmake.in" -@@ -2860,17 +2864,18 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release - set_tests_properties(CTestTestStopTime PROPERTIES - PASS_REGULAR_EXPRESSION "The stop time has been passed") - -- configure_file( -- "${CMake_SOURCE_DIR}/Tests/CTestTestSubdir/test.cmake.in" -- "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/test.cmake" -- @ONLY ESCAPE_QUOTES) -- add_test(CTestTestSubdir ${CMAKE_CTEST_COMMAND} -- -S "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/test.cmake" -V -- --output-log "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/testOutput.log" -- ) -- #make sure all 3 subdirs were added -- set_tests_properties(CTestTestSubdir PROPERTIES -- PASS_REGULAR_EXPRESSION "0 tests failed out of 3") -+# This test fails to build 2 of the 3 tests -+# configure_file( -+# "${CMake_SOURCE_DIR}/Tests/CTestTestSubdir/test.cmake.in" -+# "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/test.cmake" -+# @ONLY ESCAPE_QUOTES) -+# add_test(CTestTestSubdir ${CMAKE_CTEST_COMMAND} -+# -S "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/test.cmake" -V -+# --output-log "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/testOutput.log" -+# ) -+# #make sure all 3 subdirs were added -+# set_tests_properties(CTestTestSubdir PROPERTIES -+# PASS_REGULAR_EXPRESSION "0 tests failed out of 3") - - configure_file( - "${CMake_SOURCE_DIR}/Tests/CTestTestTimeout/test.cmake.in" --- -2.9.3 - -- 2.15.1 From unknown Wed Aug 20 01:19:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#30390] [PATCH 0/3] Update cmake. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Feb 2018 15:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Arun Isaac , 30390@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 30390-submit@debbugs.gnu.org id=B30390.151948538418226 (code B ref 30390); Sat, 24 Feb 2018 15:17:02 +0000 Received: (at 30390) by debbugs.gnu.org; 24 Feb 2018 15:16:24 +0000 Received: from localhost ([127.0.0.1]:58844 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epbYm-0004ju-Bm for submit@debbugs.gnu.org; Sat, 24 Feb 2018 10:16:24 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:41687) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epbYk-0004jl-1d for 30390@debbugs.gnu.org; Sat, 24 Feb 2018 10:16:22 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 65EBF20B4D; Sat, 24 Feb 2018 10:16:21 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sat, 24 Feb 2018 10:16:21 -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=YHHhFRtG4X82whOWv27tt3popIhig6GA0lg3y6YIzAQ=; b=NIp28c0F C+OC2Mi0+H0ej+5asXV7Wo90j9Z10j4TGoyhxZpuMMot0kBw8aCacXt6Q4aWVGkn aQBba2Z6v1AoRXBmZ2aINCPoUh/XYvKeXte6PRI1CbGQQILMXiw/C3GDQ4NGEzUM 6S2IDXTAHena6Qdt6WzKo3RJDRFNHOlihna1XeykJWbL5GyBlCOfqDNvHn/3xAMn ocqo0ja4oyTaSm7anHO1eU15tADm8PgALNKgd1kabLNyRrfhfCdn3WtSQ9kbjKAV pEQnB3OqRZjbiTVBhvZaJ6kXd1jPdWcIF66pbg3t19HSkTG/acB5sMPYsrNZmujM QU2UhcSTvHhOzw== 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=YHHhFRtG4X82whOWv27tt3popIhig 6GA0lg3y6YIzAQ=; b=MqFmfc+o+ga6lIaw5gJFrLOdv93ZaaRpJyH8Gd3on3R7h KYq9A/i6hmJoqCXhDZaZmB0O9n065+vm5hyVHtGxRhkrLD6m55OL/pZHlc/Hhuzl yud880HwOJ6VPeBVV3Yt3tVfPL1p8C4hWW6GS4PvY+MnczitHVkgDfoCa7eGmVS6 PR5bLwE7SsIvoUqf+h/qD7Z9SzD54kQQYEaluAGn5TvO20cXt9g+/ZJn1Tw2ylnQ 9bMeBnHGZ6YsQelRIZ2Pkkbu4pXbHfVNYijKoCmtXPJ9gg3n31yXL3gQ7iCAuyDm kOWBJml6+dCbBBCZ4bM0hlBthEeu27LWR12zJHvPA== 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 DDE7824802; Sat, 24 Feb 2018 10:16:20 -0500 (EST) From: Marius Bakke In-Reply-To: <20180224130849.8886-1-arunisaac@systemreboot.net> References: <20180224130849.8886-1-arunisaac@systemreboot.net> User-Agent: Notmuch/0.26 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) Date: Sat, 24 Feb 2018 16:16:19 +0100 Message-ID: <87371qa058.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-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 Arun Isaac writes: > Test 92 of tar 1.30 fails on my system. I had to disable tar tests to get my > cmake to build. I am not entirely sure if the test failure has got something > to do with insufficient memory on my system. So, I'd like somebody to > reproduce the problem before patching it. That test fails on one of my build nodes with 64GB RAM as well. There is a bug report about it upstream: . However, the suggested fix does not work for me (I think it requires running autoreconf, but haven't tried that yet). > I'm a little confused now. Shouldn't I rebase the core-updates branch against > master in order to have rhash? Wouldn't this disrupt the evaluation of > core-updates on the build farm? Sorry I'm not very clear about how we handle > core-updates. We don't rebase 'live' branches. The best way is to merge master, or you could cherry-pick the patches. I can merge it later if you're not comfortable doing it :-) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlqRgcMACgkQoqBt8qM6 VPoAnQf9Hm/Zw+6HzY/fXIFEOhm2LcY1p1TkGez7xQ2jH+2qXnBvvl7buyJUyWX1 9LEk1QUeKAifXX6kOHYLwbE+c/FBD1q24er+L8GFH0pnlmy5V7HbORCfjpk05WfC VXxLR5pXq4Nv9wJJkdSK8HZ6mQqtiVo7NbltYndLOdhySJWl8tXMBx6vbm5UoU4X lBa98aLPh+VvJzIpMqeGyqw0s3BWsDTBQTH8Jq4E4xpx+9rIrZCBIJdNwljLtHVI JUV1QgFMVLbW4aHRFhHDZrI3zDrTStaPIfnEcQutJosqgB1KOBovuwwO1h7FcZ7U E6Un7J+6yTbOSw9b+i0HIyyJuO6iwg== =YnC5 -----END PGP SIGNATURE----- --=-=-=-- From unknown Wed Aug 20 01:19:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#30390] [PATCH 0/3] Update cmake. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Feb 2018 15:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Arun Isaac , 30390@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 30390-submit@debbugs.gnu.org id=B30390.151948554918469 (code B ref 30390); Sat, 24 Feb 2018 15:20:01 +0000 Received: (at 30390) by debbugs.gnu.org; 24 Feb 2018 15:19:09 +0000 Received: from localhost ([127.0.0.1]:58850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epbbQ-0004np-Qe for submit@debbugs.gnu.org; Sat, 24 Feb 2018 10:19:08 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:48473) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epbbM-0004ne-74 for 30390@debbugs.gnu.org; Sat, 24 Feb 2018 10:19:07 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 2276920A8F; Sat, 24 Feb 2018 10:19:04 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sat, 24 Feb 2018 10:19:04 -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=zlfxu8JNmiCSQ/HICj9tgAD7lDAEYSeup6N7iphy06Y=; b=Js0WNgrj QdAhTyBcjsIBytYLm9gzt0IbCkCOBznsA5LiUo/Pm8mXRDuNdmlx8dzAPoSCIUKs +uFoU0J5qkXjEtbegNlYLIRuqcO1w/SiyDrKl8VavkTKaQX3B6wfQi60tloW8asX ssh66UQo/GfAlQohBzxZNSXRPmiPN2RVShTzaVjM0+FdhW+v/8vJPBrVQHC30BrW XQpD7xir6ofmU481RuDeYiQjItSBksG78G6E0FQQxmq7gISYza+/Sk/2xugu8gsP 9CtGzlYmrPCxItvMnDuqUjgog4TC3RIceuO5vPh+aOyyMvlrTr4ce7b9pyP6euVy jxyzxjoHMaEO6A== 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=zlfxu8JNmiCSQ/HICj9tgAD7lDAEY Seup6N7iphy06Y=; b=S1E/3vaRE6AH+sZQvkmxMTAbGGSsyACAzM6UFu95sqJZ+ vbK+e0JjMZSajT4+wGLAqvRxrUmgJFqPcD8vqPI9QHVeXp6xN1Mzp3KE5iS5HoE1 dQSGc6Fpz2cmq2+rL41qSyIu6EqJKXS2trWrIUfgGSJaKXsGnSRd0rcTPAdVvWPz WrgU3n+AsO9JWk/2Um2DsRuIcddkvb6Br6s3jlEJsjuXtQY0zAxWl5Uvq/dvpOXf QZs4sQTDvZMBxPCxngN9oUsPJv+g5Gc+rm6Bnj0xUN6KJtqjBk5YX1tFY2AXvV+q cQFhAAaCLgKZF/wn0lc+J61ZHSjph8GTN+qW+tquQ== 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 A98E924108; Sat, 24 Feb 2018 10:19:03 -0500 (EST) From: Marius Bakke In-Reply-To: <20180224130849.8886-1-arunisaac@systemreboot.net> References: <20180224130849.8886-1-arunisaac@systemreboot.net> User-Agent: Notmuch/0.26 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) Date: Sat, 24 Feb 2018 16:19:02 +0100 Message-ID: <87zi3y8lg9.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-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 Arun Isaac writes: > Arun Isaac (3): > gnu: sqlite: Fix source URI. > gnu: cmake: Update to 3.10.2. > gnu: cmake: Re-indent. > > gnu/local.mk | 1 - > gnu/packages/cmake.scm | 154 ++++++++++++++++------------- > gnu/packages/databases.scm | 2 +- > gnu/packages/patches/cmake-fix-tests.patch | 120 ---------------------- > 4 files changed, 85 insertions(+), 192 deletions(-) > delete mode 100644 gnu/packages/patches/cmake-fix-tests.patch Thanks! The patches LGTM. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlqRgmYACgkQoqBt8qM6 VPpc+Qf/bGknHsXDdOoYi/gZaiqNvSRmhfZn9Zi07QuRuFNhQkKQLlCRDBNLgzlT UhcUrOu1HuudQqk0E/jwtSbFAH+8s637k0MYiOMqkIvdBZfd4BVycfiuCt/JKTI3 Mf7z4ATXQxeZ+o0ZmHhXtquG1IGlFKPty2XLZZQSJ/EJjp0WY02IKMnM0XGr0ova QOf6XBjvikUzq0TUuzOImYf7x7aAQ8minlFI7jHZHqydjsGE1djzWOCxjnHlc7HC SWKD/RcEPw7Ev94ZgNyP/35CuGRx3e8unpEcjmLGVpcipHlID7RIqYuEatliHXsj 8ILjcIJ8HOfcRSl4vkWl4FkYgNLw1g== =NSNP -----END PGP SIGNATURE----- --=-=-=-- From unknown Wed Aug 20 01:19:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#30390] [PATCH 0/3] Update cmake. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Feb 2018 19:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke , 30390@debbugs.gnu.org Received: via spool by 30390-submit@debbugs.gnu.org id=B30390.151949922914127 (code B ref 30390); Sat, 24 Feb 2018 19:08:02 +0000 Received: (at 30390) by debbugs.gnu.org; 24 Feb 2018 19:07:09 +0000 Received: from localhost ([127.0.0.1]:59029 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epfA5-0003fn-3R for submit@debbugs.gnu.org; Sat, 24 Feb 2018 14:07:09 -0500 Received: from vultr.systemreboot.net ([45.77.148.100]:51914) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epfA3-0003fG-0z for 30390@debbugs.gnu.org; Sat, 24 Feb 2018 14:07:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Type:MIME-Version:Message-ID:Date: References:In-Reply-To:Subject:To:From:Sender:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Iq2pLtiehXRcS1B6moPmXS8Yi5gG4o5KKI3scTe+JCk=; b=nv4akRRPZBNOw4HRU98mUoXzh 8wstMDD4bLodP5FzZbZr2cek1bLxa/rTlKuv7OQwLVdQpozpJyvtFWOZwdae67+E+n8V8r8nIwuvK l4QrO4Cy1htpLEsW2zwmQSMeB0QQ2bYXvTlzAJafkcK4CA4J6aPMz4/7TNSlOLP418MYg=; Received: from [117.249.168.75] (helo=steel) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1epf9t-0006ki-AP; Sun, 25 Feb 2018 00:36:58 +0530 From: Arun Isaac In-Reply-To: <87371qa058.fsf@fastmail.com> References: <20180224130849.8886-1-arunisaac@systemreboot.net> <87371qa058.fsf@fastmail.com> Date: Sun, 25 Feb 2018 00:36:48 +0530 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) 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 (/) > We don't rebase 'live' branches. The best way is to merge master, or > you could cherry-pick the patches. I can merge it later if you're not > comfortable doing it :-) Yes, it would be best if you handle this. I am quite sleep deprived, and might do something stupid. :-P From unknown Wed Aug 20 01:19:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#30390] [PATCH 0/3] Update cmake. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Feb 2018 21:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Arun Isaac , 30390@debbugs.gnu.org Received: via spool by 30390-submit@debbugs.gnu.org id=B30390.151950707825378 (code B ref 30390); Sat, 24 Feb 2018 21:18:02 +0000 Received: (at 30390) by debbugs.gnu.org; 24 Feb 2018 21:17:58 +0000 Received: from localhost ([127.0.0.1]:59086 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ephCe-0006bE-Ix for submit@debbugs.gnu.org; Sat, 24 Feb 2018 16:17:57 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:52897) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ephCc-0006b6-2X for 30390@debbugs.gnu.org; Sat, 24 Feb 2018 16:17:54 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 79CF920ABF; Sat, 24 Feb 2018 16:17:53 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sat, 24 Feb 2018 16:17:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= 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=hELX/VUBWTEWwqrXF1Eq1hmHfud7zDAO0GSLBtjWlOc=; b=sBW96Hm1 XAEO9F2wgWs7dIZ7pidtIEFrDdk5Qc7S4MolU1l02d2+Dh/Igq0pGZAI0pLzz/51 3c31jrlb02w+fjKmr9j050dhCpo4Bk8SraiPwY3eB9vAXzZoT3G7osOPDUvWZcXc TYLsDPovfTsMLK6SpA/h761DQkEdDHgvmFZANo/Y5pcqwJsfUVk3FZrbokJnamL7 37wz0FXbbQTE49BXtBA3ob8ppDXT24lMUR7Y/JVCghhp/ZqpAQWAe6Umi2ZuuCOR ewZJ91xBcOWsOAPHvWmqD1p0IcqDNZ9T/7zfqHIGzbmg9biXHuCKOdXNX43k2OrE 8Xf2QN4P7FC1qg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=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=hELX/VUBWTEWwqrXF1Eq1hmHfud7z DAO0GSLBtjWlOc=; b=Mg/LaNhg2pz5o6yh4nm8NtKygk1/o8pUpX2GupF4XEK+p vzxJNYRdPgcNL2jByYuYAXWQpEW0F708eMnrgll7R7MiaoxXGYoOjTEMY0sjXK2s Fo8ljoUAVu0ABkGzCd21kVcEZl4yl4/EwmRZLkwhAniIEVE43eZGoADPvnQe5fsY ZXyEPOJYR8Xpo1NBkxjDAZCluYf66imM+jFqN9VrbtiDJSQHyDHJnNdahisxRU+R Glge++iphcxutN2p3d0rc2BihQ/G4l3BsvvG97eX+DKhcPmp+food5d8RGNBdOeF 7E0DKN0HdnMLcYmAzoMOO2b8rrz2cCGjVgRS2LgvQ== 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 138C724802; Sat, 24 Feb 2018 16:17:52 -0500 (EST) From: Marius Bakke In-Reply-To: References: <20180224130849.8886-1-arunisaac@systemreboot.net> <87371qa058.fsf@fastmail.com> User-Agent: Notmuch/0.26 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) Date: Sat, 24 Feb 2018 22:17:51 +0100 Message-ID: <87r2pa84u8.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-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 Arun Isaac writes: >> We don't rebase 'live' branches. The best way is to merge master, or >> you could cherry-pick the patches. I can merge it later if you're not >> comfortable doing it :-) > > Yes, it would be best if you handle this. I am quite sleep deprived, and > might do something stupid. :-P Merged! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlqR1n8ACgkQoqBt8qM6 VPqcMAgAp7CwxnY9D4SPHcZUhA8OMX4ySm3eABhY0ej3ZiFzZU4ptql7P/NhNfL8 9I5QlTBV6wyDCe3/k6loMkCU5t08mIOvy0ax21Vnvm6HFJujo6ydbCuKYZfzGKS9 ONsjtN7qpnGihw5OXzvYjUtUSTvWzRvVYmGFL670r/dOFynzdrtng2ot1bQ4CL54 sN3YauiOA6rX/tcWbC5+A7EC6mpY7CZNwefchKhcZB2E9WeAMmbTybZq7sHEO3hJ S85dP5xh50zYhFh3UaSnkyc91sZZyS5fKDAuy3rt2S2TT3NKK8D/8uyU0/yu8pE4 Hbj6FDqwKZGD7e+0tsBa42u+66Waog== =pUFU -----END PGP SIGNATURE----- --=-=-=-- From unknown Wed Aug 20 01:19:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#30390] [PATCH 0/3] Update cmake. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Feb 2018 17:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke Cc: Arun Isaac , 30390@debbugs.gnu.org Received: via spool by 30390-submit@debbugs.gnu.org id=B30390.15197520376469 (code B ref 30390); Tue, 27 Feb 2018 17:21:01 +0000 Received: (at 30390) by debbugs.gnu.org; 27 Feb 2018 17:20:37 +0000 Received: from localhost ([127.0.0.1]:35866 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eqivc-0001gH-MQ for submit@debbugs.gnu.org; Tue, 27 Feb 2018 12:20:36 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:53890) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eqivb-0001g7-2W for 30390@debbugs.gnu.org; Tue, 27 Feb 2018 12:20:35 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 99F9511A3A; Tue, 27 Feb 2018 18:20:34 +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 5rdsW1AYZ97m; Tue, 27 Feb 2018 18:20:34 +0100 (CET) Received: from ribbon (unknown [193.50.110.216]) by hera.aquilenet.fr (Postfix) with ESMTPSA id CBAC31054D; Tue, 27 Feb 2018 18:20:33 +0100 (CET) From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20180224130849.8886-1-arunisaac@systemreboot.net> <87371qa058.fsf@fastmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 9 =?UTF-8?Q?Vent=C3=B4se?= an 226 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Tue, 27 Feb 2018 18:20:33 +0100 In-Reply-To: <87371qa058.fsf@fastmail.com> (Marius Bakke's message of "Sat, 24 Feb 2018 16:16:19 +0100") Message-ID: <87a7vuz6vy.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-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: > Arun Isaac writes: > >> Test 92 of tar 1.30 fails on my system. I had to disable tar tests to ge= t my >> cmake to build. I am not entirely sure if the test failure has got somet= hing >> to do with insufficient memory on my system. So, I'd like somebody to >> reproduce the problem before patching it. > > That test fails on one of my build nodes with 64GB RAM as well. > > There is a bug report about it upstream: > . I hadn=E2=80=99t seen your message and worked around it in a crude way: https://git.savannah.gnu.org/cgit/guix.git/commit/?h=3Dcore-updates&id=3D= ad2e1422783000dd4224eab155ce532888aaef0b The patch proposed on bug-tar seems to make sense because it fixes the order of files in the archive. Ludo=E2=80=99. From unknown Wed Aug 20 01:19:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#30390] [PATCH 0/3] Update cmake. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Mar 2018 10:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Arun Isaac , 30390@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 30390-submit@debbugs.gnu.org id=B30390.152154251916017 (code B ref 30390); Tue, 20 Mar 2018 10:42:02 +0000 Received: (at 30390) by debbugs.gnu.org; 20 Mar 2018 10:41:59 +0000 Received: from localhost ([127.0.0.1]:42760 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eyEiM-0004AH-OB for submit@debbugs.gnu.org; Tue, 20 Mar 2018 06:41:58 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:39081) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eyEiI-0004A3-LZ for 30390@debbugs.gnu.org; Tue, 20 Mar 2018 06:41:57 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 35A402191B; Tue, 20 Mar 2018 06:41:54 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Tue, 20 Mar 2018 06:41:54 -0400 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=hbk90Mh8366WYP56F+VTCf8C19jnZN2XI5qQi9GbRDQ=; b=fSd+i2iX HOJGJMnEEABwP+Su/CPgq0UM8BBcuJ+DTyZIqotTnMQaxv7TFhNwdtQzkyUYax/T 6X706+feFw3CCdwNEn48AMEvEsQvdyzHk8wjjp42rgvHGRMF422TcegOVJfSDZk+ RnPSua43DLbiV5fv3Jo2t2LdNdTaRbiHLZ3HA3Al6JgUdlsoxrCSrgdztUicuzA9 9E14C7XWjbMoepQXN3GttKIONNyGkm1M1oXhm1LX5fvuyG+tMwBeaCLKQFMU9eRf aFa2DGoku5JRhmKRPxVGM1gy5a/fSc+66AdNoXGRx32o5MSYJWsmHsQ5JX0SSqma mIdToZpsIbznqQ== 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=hbk90Mh8366WYP56F+VTCf8C19jnZ N2XI5qQi9GbRDQ=; b=a/GinZimyjv38eeYX0pE3R9scITm2nfs3F2QPDbqVUoFU YtThBd6Oo6MrJku5TOeVvM83UCbNWwjPzDKAMw+hfRpum825yauaacnqfvnzP1rX p003WUsFNZMoSWPnjNMjl7/WOtoPr8fDRe8sB4KcrLTASpVQlTcwlMold+EbD0hZ 3++FYOL+NZQHsvJFRxPA4AByB3r5weqChBdBbCcMgwm0pTNcD5JbSi8+E0WnjAjx +QI8b6Szbni5F+t3p7r3lzgZZUiOtXww7k29eypeHmzwt2uxH9BadLKgDxzasUNR 83Bg/MNdQTgaJpeLFM9f24j+fkJiJq2Joe+o85EaQ== X-ME-Sender: Received: from localhost (ti0019a400-2817.bb.online.no [88.90.102.17]) by mail.messagingengine.com (Postfix) with ESMTPA id B23BF24253; Tue, 20 Mar 2018 06:41:53 -0400 (EDT) From: Marius Bakke In-Reply-To: <87zi3y8lg9.fsf@fastmail.com> References: <20180224130849.8886-1-arunisaac@systemreboot.net> <87zi3y8lg9.fsf@fastmail.com> User-Agent: Notmuch/0.26 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) Date: Tue, 20 Mar 2018 11:41:52 +0100 Message-ID: <87po3zf2q7.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-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 Marius Bakke writes: > Arun Isaac writes: > >> Arun Isaac (3): >> gnu: sqlite: Fix source URI. >> gnu: cmake: Update to 3.10.2. >> gnu: cmake: Re-indent. >> >> gnu/local.mk | 1 - >> gnu/packages/cmake.scm | 154 ++++++++++++++++------------- >> gnu/packages/databases.scm | 2 +- >> gnu/packages/patches/cmake-fix-tests.patch | 120 ---------------------- >> 4 files changed, 85 insertions(+), 192 deletions(-) >> delete mode 100644 gnu/packages/patches/cmake-fix-tests.patch > > Thanks! The patches LGTM. Ping! Core-updates is shaping up, so now is the time to push :-) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlqw5XAACgkQoqBt8qM6 VPpp3Af9EAPgPunOQG0tkqXou+Oqyu72iv2NdKk9VsxJDgjakPl16fnw2Y+8VaIM i+evS/79YEYAa9DkBofYBaspkUYLNPkoQybUqrsQK95BAT77rgj7+7a4WiPlOhb8 Zfr+AuwLeH3puFQUfuD0PMvc9Z1SSIQRZOa3+y1UNdm9ssU1eEfj/0FG8/zFEjF7 pwHl902M15iGNuqo6Y6Xzip/ZrDIF2wjCRAzMlD4LaspKKcg/UTpB5KScR94DV1t xuEks7pzMYwI/KcvmxmaE/VUmOhtYR2zldFC7Fauw24jWgD7ZMrzczHbJSUBto47 JY1ha9rgW1O1mImua1Ll7igIArUEAw== =cKi1 -----END PGP SIGNATURE----- --=-=-=-- From unknown Wed Aug 20 01:19:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#30390] [PATCH 0/3] Update cmake. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Mar 2018 21:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke , 30390@debbugs.gnu.org Received: via spool by 30390-submit@debbugs.gnu.org id=B30390.152166829317142 (code B ref 30390); Wed, 21 Mar 2018 21:39:01 +0000 Received: (at 30390) by debbugs.gnu.org; 21 Mar 2018 21:38:13 +0000 Received: from localhost ([127.0.0.1]:46345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eylQy-0004SQ-Ns for submit@debbugs.gnu.org; Wed, 21 Mar 2018 17:38:12 -0400 Received: from vultr.systemreboot.net ([45.77.148.100]:37222) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eylQw-0004SA-0A for 30390@debbugs.gnu.org; Wed, 21 Mar 2018 17:38:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Type:MIME-Version:Message-ID:Date: References:In-Reply-To:Subject:To:From:Sender:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=K7WPCGUfg9siD+oil4XBRUYH91VsPXLjUWzIP7FBgFI=; b=AW+X1zpHNM2RJUXoQ0kVneTsF zSzEla4q9eGdZhCZ3js7G6vlhwbPIQ4mf7ylQizTR7hhALwDUQ4jcXaOiPaHR5U4KKvvF/eNsYWRY 7gkOp3lIX6138f+q7U6xxYuZlLyKGNte3K2bm7gnWImrtRRVZ+jiwzki+Ih+O+IkXAMZo=; Received: from [45.125.40.89] (helo=steel) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1eylQm-000101-TW; Thu, 22 Mar 2018 03:08:01 +0530 From: Arun Isaac In-Reply-To: <87po3zf2q7.fsf@fastmail.com> References: <20180224130849.8886-1-arunisaac@systemreboot.net> <87zi3y8lg9.fsf@fastmail.com> <87po3zf2q7.fsf@fastmail.com> Date: Thu, 22 Mar 2018 03:08:00 +0530 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) 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 (/) Marius Bakke writes: > Ping! Core-updates is shaping up, so now is the time to push :-) I'm rebasing against all the new changes in core-updates, and building one last time to make sure everything is fine. Then, I'll push. From unknown Wed Aug 20 01:19:53 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Arun Isaac Subject: bug#30390: closed (Re: [PATCH 0/3] Update cmake.) Message-ID: References: <20180208121323.14840-1-arunisaac@systemreboot.net> X-Gnu-PR-Message: they-closed 30390 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 30390@debbugs.gnu.org Date: Fri, 23 Mar 2018 06:26:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1521786362-24423-1" This is a multi-part message in MIME format... ------------=_1521786362-24423-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #30390: [PATCH 0/3] Update cmake to 3.10.2. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 30390@debbugs.gnu.org. --=20 30390: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D30390 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1521786362-24423-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 30390-done) by debbugs.gnu.org; 23 Mar 2018 06:25:36 +0000 Received: from localhost ([127.0.0.1]:48572 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ezG8t-0006LI-Nl for submit@debbugs.gnu.org; Fri, 23 Mar 2018 02:25:35 -0400 Received: from vultr.systemreboot.net ([45.77.148.100]:44648) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ezG8r-0006L4-Dt for 30390-done@debbugs.gnu.org; Fri, 23 Mar 2018 02:25:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Type:MIME-Version:Message-ID:Date: References:In-Reply-To:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=82x6tH7aGTa3QMRkJZ9Vf2G3nI9LtNLHPApXrRAbaZA=; b=TnSe2cuV5/v/TdQN/+MVHAnQB iKPEBZjtm5zHa8HVTdS5sKUs+hqqbnr/nUfeX2WSgbafPqbBZyrGpQpe4/Giuxc/GD0JyKKFSEC9E GBCWiuH0pqvoL8H8uIwc3xswvFDpjZAhUl6NPfY7OREzQFLQCD/OSnJqc6Qo+P9fbUvD0=; Received: from [117.192.124.137] (helo=steel) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ezG8i-0005WA-KM; Fri, 23 Mar 2018 11:55:24 +0530 From: Arun Isaac To: 30390-done@debbugs.gnu.org Subject: Re: [PATCH 0/3] Update cmake. In-Reply-To: References: <20180224130849.8886-1-arunisaac@systemreboot.net> <87zi3y8lg9.fsf@fastmail.com> <87po3zf2q7.fsf@fastmail.com> Date: Fri, 23 Mar 2018 11:55:12 +0530 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 30390-done 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 (/) Pushed to core-updates! ------------=_1521786362-24423-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 8 Feb 2018 12:14:27 +0000 Received: from localhost ([127.0.0.1]:33769 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ejl5v-00057o-Hv for submit@debbugs.gnu.org; Thu, 08 Feb 2018 07:14:27 -0500 Received: from eggs.gnu.org ([208.118.235.92]:41583) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ejl5s-00057Z-Dl for submit@debbugs.gnu.org; Thu, 08 Feb 2018 07:14:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ejl5i-00023K-8n for submit@debbugs.gnu.org; Thu, 08 Feb 2018 07:14:19 -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.0 required=5.0 tests=BAYES_20,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:56986) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ejl5i-000234-5G for submit@debbugs.gnu.org; Thu, 08 Feb 2018 07:14:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejl5f-0008F8-Kt for guix-patches@gnu.org; Thu, 08 Feb 2018 07:14:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ejl5e-00020c-NI for guix-patches@gnu.org; Thu, 08 Feb 2018 07:14:11 -0500 Received: from [2001:19f0:5:274f:4827:c39:448f:6777] (port=53058 helo=vultr.systemreboot.net) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ejl5e-0001vm-68 for guix-patches@gnu.org; Thu, 08 Feb 2018 07:14:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Message-Id:Date:Subject:Cc:To:From:Sender: Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=2Rd3eaItwADFpMa9vXw21S7DYm+JJBVKXmh302MV5yU=; b=YShl/txrNwK9qcORnJpCKDuM7F B+3Xwk4XlaYLy9oFZwk19fZFJOLoJK5DI8Gx7IyBugENuKTLDP2KDVUumU9hRASh9vE43vnd26N56 6eAwlULxMJ+JA7pxTgi7nFPx/5nlVPVwJ36Hq8ByBoEUpVnujgTGRZYkQyWZFRJd8jMk=; Received: from [45.125.43.69] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90) (envelope-from ) id 1ejl5X-0001Rg-Ua; Thu, 08 Feb 2018 17:44:04 +0530 From: Arun Isaac To: guix-patches@gnu.org Subject: [PATCH 0/3] Update cmake to 3.10.2. Date: Thu, 8 Feb 2018 17:43:23 +0530 Message-Id: <20180208121323.14840-1-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.15.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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.1 (----) X-Debbugs-Envelope-To: submit Cc: Arun Isaac 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.1 (----) Looks like we have missed several releases of cmake. I have upgraded to 3.10.2, the latest release. About the jsoncpp circular dependency: jsoncpp upstream has switched from the cmake build system to the meson build system. So, the circular dependency can now be avoided. I was able to successfully build jsoncpp with our meson-build-system. However, cmake failed to build with this new jsoncpp. I couldn't figure out how to proceed. So, I abandoned that effort, and left cmake to use its bundled jsoncpp. About the bundled libuv: The cmake build fails if the bundled libuv is deleted (look at the snippet). I had to avoid deleting it for the build to work. Arun Isaac (3): gnu: Add rhash. gnu: libuv: Update to 1.19.1. gnu: cmake: Update to 3.10.2. gnu/local.mk | 1 - gnu/packages/cmake.scm | 153 ++++++++++++++++------------- gnu/packages/crypto.scm | 50 ++++++++++ gnu/packages/libevent.scm | 20 ++-- gnu/packages/patches/cmake-fix-tests.patch | 120 ---------------------- 5 files changed, 143 insertions(+), 201 deletions(-) delete mode 100644 gnu/packages/patches/cmake-fix-tests.patch -- 2.15.1 ------------=_1521786362-24423-1--