[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#30390] [PATCH 3/3] gnu: cmake: Update to 3.10.2.
From: |
Marius Bakke |
Subject: |
[bug#30390] [PATCH 3/3] gnu: cmake: Update to 3.10.2. |
Date: |
Tue, 20 Feb 2018 18:54:50 +0100 |
User-agent: |
Notmuch/0.26 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) |
Arun Isaac <address@hidden> 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. :-)
signature.asc
Description: PGP signature