;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2019, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix utils)
#:use-module (guix deprecation)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system cmake)
#:use-module (guix build-system emacs)
#:use-module (gnu packages)
#:use-module (gnu packages backup)
#:use-module (gnu packages crypto)
#:use-module (gnu packages curl)
#:use-module (gnu packages file)
+ #:use-module (gnu packages hurd)
+ #:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages libevent)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages serialization)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1))
-;;; The "bootstrap" CMake. It is used to build the inputs of 'cmake-minimal'
-;;; below, to prevent a cyclic dependency on cmake-build-system.
+(define-public cmake-shared
+ (let ((commit "8122f2b96c8da38ea41b653cf69958e75fe2129d")
+ (revision "32"))
+ (package
+ (name "cmake-shared")
+ (version
+ (git-version "1.1.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/lirios/cmake-shared.git")
+ (commit commit)))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "05avwzqcnliwx9h7qi1kl0iz4smqmxc4vkavyjbmlc6h2b97i58g"))
+ (modules '((guix build utils)
+ (ice-9 ftw)
+ (srfi srfi-1)))
+ (snippet
+ `(begin
+ (delete-file-recursively "3rdparty")))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:tests? #f)) ; No target
+ (native-inputs
+ `(("extra-cmake-modules" ,extra-cmake-modules)))
+ (synopsis "Shared CMake functions and macros")
+ (description "CMake-Shared are shared functions and macros for projects
+using the CMake build system.")
+ (home-page "https://github.com/lirios/cmake-shared/")
+ (license license:bsd-3))))
+
+;;; Build phases shared between 'cmake-bootstrap' and the later variants
+;;; that use cmake-build-system.
+(define %common-build-phases
+ `((add-after 'unpack 'split-package
+ ;; Remove files that have been packaged in other package recipes.
+ (lambda _
+ (delete-file "Auxiliary/cmake-mode.el")
+ (substitute* "Auxiliary/CMakeLists.txt"
+ ((".*cmake-mode.el.*") ""))
+ #t))
+ (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/Internal/CPack/CPack.RuntimeScript.in"
+ "Source/cmGlobalXCodeGenerator.cxx"
+ "Source/cmLocalUnixMakefileGenerator3.cxx"
+ "Source/cmExecProgramCommand.cxx"
+ "Utilities/Release/release_cmake.cmake"
+ "Tests/CMakeLists.txt"
+ "Tests/RunCMake/File_Generate/RunCMakeTest.cmake")
+ (("/bin/sh") (which "sh")))
+ #t))))
+
+(define %common-disabled-tests
+ '(;; This test copies libgcc_s.so.1 from GCC and tries to modify its RPATH,
+ ;; but does not cope with the file being read-only.
+ "BundleUtilities"
+ ;; This test requires network access.
+ "CTestTestUpload"
+ ;; This test requires 'ldconfig' which is not available in Guix.
+ "RunCMake.install"))
+
+(define %preserved-third-party-files
+ '(;; '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"))
+
+;;; 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.3")
+ (version "3.16.5")
(source (origin
(method url-fetch)
- (uri (string-append "https://www.cmake.org/files/v"
+ (uri (string-append "https://cmake.org/files/v"
(version-major+minor version)
"/cmake-" version ".tar.gz"))
(sha256
(base32
- "0s06wrp0jnw2l4yq94skj53hwnz7lqrmhh96sq7w7njkkggickz5"))
+ "1z4bb8z6b4dvq5hrvajrf1hyybqay3xybyimf71w1jgcp180nxjz"))
(modules '((guix build utils)
(ice-9 ftw)))
(snippet
- '(begin
- (with-directory-excursion "Utilities"
- ;; CMake bundles its dependencies below "Utilities" with a
- ;; "cm" prefix in the directory name. Delete those to ensure
- ;; the system libraries are used.
- (for-each delete-file-recursively
- (scandir
- "."
- (lambda (file)
- (and (string-prefix? "cm" file)
- (eq? 'directory (stat:type (stat file)))
+ `(begin
+ ;; CMake bundles its dependencies in the "Utilities" directory.
+ ;; Delete those to ensure the system libraries are used.
+ (define preserved-files
+ '(,@%preserved-third-party-files
+ ;; 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"))
- ;; jsoncpp must be kept around for now to
- ;; work around a circular dependency. It
- ;; gets deleted once we reach "cmake-minimal".
- ;; TODO: Consider building jsoncpp with
- ;; Meson instead, once meson-build-system
- ;; learns cross-compilation.
- (not (string=? "cmjsoncpp" file))
-
- ;; XXX: cmake's bootstrap script appears to
- ;; rquire libuv, even though it detects and
- ;; uses the system version eventually.
- (not (string=? "cmlibuv" file)))))))
+ (file-system-fold (lambda (dir stat result) ;enter?
+ (or (string=? "Utilities" dir) ;init
+ ;; The bundled dependencies are
+ ;; distinguished by having a "cm"
+ ;; prefix to their upstream names.
+ (and (string-prefix? "Utilities/cm" dir)
+ (not (member dir preserved-files)))))
+ (lambda (file stat result) ;leaf
+ (unless (or (member file preserved-files)
+ ;; Preserve top-level files.
+ (string=? "Utilities"
+ (dirname file)))
+ (delete-file file)))
+ (const #t) ;down
+ (lambda (dir stat result) ;up
+ (when (equal? (scandir dir) '("." ".."))
+ (rmdir dir)))
+ (const #t) ;skip
+ (lambda (file stat errno result)
+ (format (current-error-port)
+ "warning: failed to delete ~a: ~a~%"
+ file (strerror errno)))
+ #t
+ "Utilities"
+ lstat)
#t))
(patches (search-patches "cmake-curl-certificates.patch"))))
(build-system gnu-build-system)
"--" "-DCMAKE_BUILD_TYPE=Release"))
#:make-flags
(let ((skipped-tests
- (list "BundleUtilities" ; This test fails on Guix.
+ (list ,@%common-disabled-tests
"CTestTestSubdir" ; This test fails to build 2 of the 3 tests.
- ;; This test requires 'ldconfig' which is not available in Guix.
- "RunCMake.install"
- ;; These tests requires network access.
- "CTestCoverageCollectGCOV"
- "CTestTestUpload")))
+ ;; This test fails when ARGS (below) is in use, see
+ ;; <https://gitlab.kitware.com/cmake/cmake/issues/17165>.
+ "CTestCoverageCollectGCOV")))
(list
(string-append
;; These arguments apply for the tests only.
" --exclude-regex ^\\(" (string-join skipped-tests "\\|") "\\)$")))
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'split-package
- ;; Remove files that have been packaged in other package recipes.
- (lambda _
- (delete-file "Auxiliary/cmake-mode.el")
- (substitute* "Auxiliary/CMakeLists.txt"
- ((".*cmake-mode.el.*") ""))
- #t))
- (add-after 'unpack 'use-system-libarchive
- (lambda* (#:key native-inputs inputs #:allow-other-keys)
- (let ((libarchive-source (assoc-ref (or native-inputs inputs)
- "libarchive:source"))
- (libarchive-version ,(package-version libarchive))
- (files-to-unpack '("libarchive/archive_getdate.c"
- "libarchive/archive_getdate.h")))
- ;; XXX: Source/cm_get_date.c includes archive_getdate.c wholesale,
- ;; so it needs to be available along with the header file.
- (mkdir-p "Utilities/cmlibarchive")
- (apply invoke "tar" "-xvf" libarchive-source
- "--strip-components=1"
- "-C" "Utilities/cmlibarchive"
- (map (lambda (file)
- (string-append "libarchive-" libarchive-version
- "/" file))
- files-to-unpack))
- #t)))
- (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/Internal/CPack/CPack.RuntimeScript.in"
- "Source/cmGlobalXCodeGenerator.cxx"
- "Source/cmLocalUnixMakefileGenerator3.cxx"
- "Source/cmExecProgramCommand.cxx"
- "Utilities/Release/release_cmake.cmake"
- "Tests/CMakeLists.txt"
- "Tests/RunCMake/File_Generate/RunCMakeTest.cmake")
- (("/bin/sh") (which "sh")))
- #t))
+ ,@%common-build-phases
(add-before 'configure 'set-paths
(lambda _
;; Help cmake's bootstrap process to find system libraries
(replace 'configure
(lambda* (#:key (configure-flags '()) #:allow-other-keys)
(apply invoke "./configure" configure-flags))))))
- (native-inputs
+ (inputs
`(("bzip2" ,bzip2)
- ;; cURL depends on ghostscript (via groff and OpenLDAP), which depends on
- ;; 'cmake-build-system' through libtiff and ultimately libjpeg-turbo.
("curl" ,curl-minimal)
("expat" ,expat)
("file" ,file)
("libarchive" ,libarchive)
- ("libarchive:source" ,(package-source libarchive))
- ("libuv" ,libuv)
+ ,@(if (hurd-target?)
+ '()
+ `(("libuv" ,libuv))) ;not supported on the Hurd
+ ("ncurses" ,ncurses) ;required for ccmake
("rhash" ,rhash)
("zlib" ,zlib)))
- (inputs
- `(("ncurses" ,ncurses))) ; required for ccmake
(native-search-paths
(list (search-path-specification
(variable "CMAKE_PREFIX_PATH")
(inherit (package-source cmake-bootstrap))
(snippet
(match (origin-snippet (package-source cmake-bootstrap))
- ((begin exp ...)
- (append '(begin (delete-file-recursively "Utilities/cmjsoncpp"))
+ ((_ _ exp ...)
+ ;; Now we can delete the remaining software bundles.
+ (append `(begin
+ (define preserved-files ',%preserved-third-party-files))
exp))))))
- (native-inputs
+ (inputs
`(("curl" ,curl)
("jsoncpp" ,jsoncpp)
- ,@(alist-delete "curl" (package-native-inputs cmake-bootstrap))))
+ ,@(alist-delete "curl" (package-inputs cmake-bootstrap))))
+ (build-system cmake-build-system)
(arguments
- (substitute-keyword-arguments (package-arguments cmake-bootstrap)
- ((#:configure-flags flags ''())
- `(delete "--no-system-jsoncpp" ,flags))))))
+ `(#:configure-flags
+ (list "-DCMAKE_USE_SYSTEM_LIBRARIES=ON"
+ (string-append "-DCMAKE_DOC_DIR=share/doc/cmake-"
+ ,(version-major+minor (package-version
+ cmake-bootstrap))))
+
+ ;; This is the CMake used in cmake-build-system. Ensure compiler
+ ;; optimizations are enabled to save size and CPU cycles.
+ #:build-type "Release"
+ #:phases
+ (modify-phases %standard-phases
+ ,@%common-build-phases
+ (replace 'check
+ (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
+ (let ((skipped-tests (list ,@%common-disabled-tests
+ ;; This test requires the bundled libuv.
+ "BootstrapTest")))
+ (if tests?
+ (begin
+ (invoke "ctest" "-j" (if parallel-tests?
+ (number->string (parallel-job-count))
+ "1")
+ "--exclude-regex"
+ (string-append "^(" (string-join skipped-tests "|") ")$")))
+ (format #t "test suite not run~%"))
+ #t))))
+ ,@(if (%current-target-system)
+ '()
+ `(#:cmake ,cmake-bootstrap))))))
;;; The "user-facing" CMake, now with manuals and HTML documentation.
(define-public cmake
(package
(inherit cmake-minimal)
(name "cmake")
+ (version "3.19.2")
+ ;; 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
+ "1w67w0ak6vf37501dlz9yhnzlvvpw1w10n2nm3hi7yxp4cxzvq73"))
+ (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)
- ((#:configure-flags configure-flags ''())
- `(append ,configure-flags
- ;; Extra configure flags used to generate the documentation.
- '("--sphinx-info"
- "--sphinx-man"
- "--sphinx-html")))
+ ;; Use cmake-minimal this time.
+ ((#:cmake _ #f)
+ (if (%current-target-system)
+ cmake-minimal-cross
+ cmake-minimal))
+
+ ;; Enable debugging information for convenience.
+ ((#:build-type _ #f) "RelWithDebInfo")
+
+ ((#:configure-flags flags ''())
+ `(append (list "-DSPHINX_INFO=ON" "-DSPHINX_MAN=ON" "-DSPHINX_HTML=ON"
+ (string-append "-DCMAKE_DOC_DIR=share/doc/cmake-"
+ ,(version-major+minor (package-version
+ cmake-minimal)))
+ "-DCMAKE_INFO_DIR=share/info"
+ "-DCMAKE_MAN_DIR=share/man")
+ ,flags))
((#:phases phases)
`(modify-phases ,phases
+ ;; TODO: Remove this override in the next rebuild cycle and adjust
+ ;; the %common-build-phases variable instead: the
+ ;; Utilities/Release/release_cmake.cmake file no longer exists in
+ ;; version 3.19.0.
+ (replace 'patch-bin-sh
+ (lambda _
+ ;; Replace "/bin/sh" by the right path in... a lot of
+ ;; files.
+ (substitute*
+ '("Modules/CompilerId/Xcode-3.pbxproj.in"
+ "Modules/Internal/CPack/CPack.RuntimeScript.in"
+ "Source/cmGlobalXCodeGenerator.cxx"
+ "Source/cmLocalUnixMakefileGenerator3.cxx"
+ "Source/cmExecProgramCommand.cxx"
+ "Tests/CMakeLists.txt"
+ "Tests/RunCMake/File_Generate/RunCMakeTest.cmake")
+ (("/bin/sh") (which "sh")))
+ #t))
+ ;; TODO: Remove this override in the next rebuild cycle and adjust
+ ;; the %common-disabled-tests variable instead.
+ (replace 'check
+ (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
+ (let ((skipped-tests (list ,@%common-disabled-tests
+ ;; This test fails for unknown reason.
+ "RunCMake.file-GET_RUNTIME_DEPENDENCIES"
+ ;; This test requires the bundled libuv.
+ "BootstrapTest")))
+ (if tests?
+ (begin
+ (invoke "ctest" "-j" (if parallel-tests?
+ (number->string (parallel-job-count))
+ "1")
+ "--exclude-regex"
+ (string-append "^(" (string-join skipped-tests "|") ")$")))
+ (format #t "test suite not run~%"))
+ #t)))
(add-after 'install 'move-html-doc
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))