me
/
guix
Archived
1
0
Fork 0
Code

gnu: cmake-bootstrap: Update to 3.19.2. 

* gnu/packages/cmake.scm (%preserved-third-party-files): Repatriate from the
cmake package definition.
(cmake-bootstrap): Update to 3.19.2.
(cmake): Remove the version and source field overrides.
master
Maxim Cournoyer 2020-12-29 15:57:25 -05:00
parent ca5f81ff57
commit 9ea8616b37
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 5 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gnu/packages/cmake.scm
View File

@ -94,14 +94,16 @@
'(;; 'Source/cm_getdate.c' includes archive_getdate.c wholesale, so it must '(;; 'Source/cm_getdate.c' includes archive_getdate.c wholesale, so it must
;; be available along with the required headers. ;; be available along with the required headers.
"Utilities/cmlibarchive/libarchive/archive_getdate.c" "Utilities/cmlibarchive/libarchive/archive_getdate.c"
"Utilities/cmlibarchive/libarchive/archive_getdate.h")) "Utilities/cmlibarchive/libarchive/archive_getdate.h"
;; CMake header wrappers.
"Utilities/cm3p"))
;;; The "bootstrap" CMake. It is used to build 'cmake-minimal' below, as well ;;; The "bootstrap" CMake. It is used to build 'cmake-minimal' below, as well
;;; as any dependencies that need cmake-build-system. ;;; as any dependencies that need cmake-build-system.
(define-public cmake-bootstrap (define-public cmake-bootstrap
(package (package
(name "cmake-bootstrap") (name "cmake-bootstrap")
(version "3.16.5") (version "3.19.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://cmake.org/files/v" (uri (string-append "https://cmake.org/files/v"
@ -109,7 +111,7 @@
"/cmake-" version ".tar.gz")) "/cmake-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1z4bb8z6b4dvq5hrvajrf1hyybqay3xybyimf71w1jgcp180nxjz")) "1w67w0ak6vf37501dlz9yhnzlvvpw1w10n2nm3hi7yxp4cxzvq73"))
(modules '((guix build utils) (modules '((guix build utils)
(ice-9 ftw))) (ice-9 ftw)))
(snippet (snippet
@ -307,39 +309,6 @@ and workspaces that can be used in the compiler environment of your choice.")
(package (package
(inherit cmake-minimal) (inherit cmake-minimal)
(name "cmake") (name "cmake")
(version "3.19.1")
;; TODO: Move the following source field to the cmake-bootstrap package in
;; the next rebuild cycle.
(source (origin
(inherit (package-source cmake-bootstrap))
(uri (string-append "https://cmake.org/files/v"
(version-major+minor version)
"/cmake-" version ".tar.gz"))
(sha256
(base32
"1fisi9rlijw9wd0yjzk1c6j7ljnb2yiq5iqnrz6m1xkflyinw9hx"))
(snippet
(match (origin-snippet (package-source cmake-bootstrap))
((_ _ exp ...)
;; Now we can delete the remaining software bundles.
(append `(begin
(define preserved-files
'(,@%preserved-third-party-files
;; TODO: Move this file to the
;; %preserved-third-party-files variable in
;; the next rebuild cycle.
"Utilities/cm3p" ;CMake header wrappers
;; Use the bundled JsonCpp during bootstrap
;; to work around a circular dependency.
;; TODO: JsonCpp can be built with Meson
;; instead of CMake, but meson-build-system
;; currently does not support
;; cross-compilation.
"Utilities/cmjsoncpp"
;; LibUV is required to bootstrap the initial
;; build system.
"Utilities/cmlibuv")))
exp))))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments cmake-minimal) (substitute-keyword-arguments (package-arguments cmake-minimal)
;; Use cmake-minimal this time. ;; Use cmake-minimal this time.