diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-12-29 15:57:25 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-12-30 08:40:43 -0500 |
| commit | 9ea8616b374ebbd107e6f03027805a3612ed280a (patch) | |
| tree | 5d312660e0e2cff693a247b12ecf417bd4b09821 /gnu/packages/cmake.scm | |
| parent | ca5f81ff57f84db28986a22832b27f13f4f24cf6 (diff) | |
| download | guix-9ea8616b374ebbd107e6f03027805a3612ed280a.tar.gz guix-9ea8616b374ebbd107e6f03027805a3612ed280a.tar.xz | |
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.
Diffstat (limited to 'gnu/packages/cmake.scm')
| -rw-r--r-- | gnu/packages/cmake.scm | 41 |
1 files changed, 5 insertions, 36 deletions
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index a68dbdd746..238c21eacb 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -94,14 +94,16 @@ '(;; 'Source/cm_getdate.c' includes archive_getdate.c wholesale, so it must ;; be available along with the required headers. "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 ;;; as any dependencies that need cmake-build-system. (define-public cmake-bootstrap (package (name "cmake-bootstrap") - (version "3.16.5") + (version "3.19.2") (source (origin (method url-fetch) (uri (string-append "https://cmake.org/files/v" @@ -109,7 +111,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "1z4bb8z6b4dvq5hrvajrf1hyybqay3xybyimf71w1jgcp180nxjz")) + "1w67w0ak6vf37501dlz9yhnzlvvpw1w10n2nm3hi7yxp4cxzvq73")) (modules '((guix build utils) (ice-9 ftw))) (snippet @@ -307,39 +309,6 @@ and workspaces that can be used in the compiler environment of your choice.") (package (inherit cmake-minimal) (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 (substitute-keyword-arguments (package-arguments cmake-minimal) ;; Use cmake-minimal this time. |