From: Marius Bakke <mbakke@fastmail.com>
To: Arun Isaac <arunisaac@systemreboot.net>, 30390@debbugs.gnu.org
Subject: [bug#30390] [PATCH 3/3] gnu: cmake: Update to 3.10.2.
Date: Tue, 20 Feb 2018 18:54:50 +0100 [thread overview]
Message-ID: <87k1v7bl79.fsf@fastmail.com> (raw)
In-Reply-To: <20180208121747.15072-3-arunisaac@systemreboot.net>
[-- Attachment #1: Type: text/plain, Size: 3853 bytes --]
Arun Isaac <arunisaac@systemreboot.net> 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. :-)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
next prev parent reply other threads:[~2018-02-20 17:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-08 12:13 [bug#30390] [PATCH 0/3] Update cmake to 3.10.2 Arun Isaac
2018-02-08 12:17 ` [bug#30390] [PATCH 1/3] gnu: Add rhash Arun Isaac
2018-02-08 12:17 ` [bug#30390] [PATCH 2/3] gnu: libuv: Update to 1.19.1 Arun Isaac
2018-02-20 17:46 ` Marius Bakke
2018-02-08 12:17 ` [bug#30390] [PATCH 3/3] gnu: cmake: Update to 3.10.2 Arun Isaac
2018-02-20 17:54 ` Marius Bakke [this message]
2018-02-20 17:44 ` [bug#30390] [PATCH 1/3] gnu: Add rhash Marius Bakke
2018-02-22 14:42 ` Arun Isaac
2018-02-22 14:48 ` Marius Bakke
2018-02-24 13:08 ` [bug#30390] [PATCH 0/3] Update cmake Arun Isaac
2018-02-24 13:08 ` [bug#30390] [PATCH 1/3] gnu: sqlite: Fix source URI Arun Isaac
2018-02-24 13:08 ` [bug#30390] [PATCH 2/3] gnu: cmake: Update to 3.10.2 Arun Isaac
2018-02-24 13:08 ` [bug#30390] [PATCH 3/3] gnu: cmake: Re-indent Arun Isaac
2018-02-24 15:16 ` [bug#30390] [PATCH 0/3] Update cmake Marius Bakke
2018-02-24 19:06 ` Arun Isaac
2018-02-24 21:17 ` Marius Bakke
2018-02-27 17:20 ` Ludovic Courtès
2018-02-24 15:19 ` Marius Bakke
2018-03-20 10:41 ` Marius Bakke
2018-03-21 21:38 ` Arun Isaac
2018-03-23 6:25 ` bug#30390: " Arun Isaac
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87k1v7bl79.fsf@fastmail.com \
--to=mbakke@fastmail.com \
--cc=30390@debbugs.gnu.org \
--cc=arunisaac@systemreboot.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).