From 89db6c6de97d717c9c2b49d94305381f998b0ca2 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 8 Feb 2018 16:49:45 +0530 Subject: gnu: cmake: Update to 3.10.2. * gnu/packages/cmake.scm (cmake): Update to 3.10.2. [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. --- gnu/packages/cmake.scm | 87 +++++++++++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 37 deletions(-) (limited to 'gnu/packages/cmake.scm') diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index e6c5c4e793..d5022dc741 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017, 2018 Marius Bakke +;;; Copyright © 2018 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,7 +42,7 @@ (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" @@ -49,8 +50,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "1q6a60695prpzzsmczm2xrgxdb61fyjznb04dr6yls6iwv24c4nw")) - (patches (search-patches "cmake-fix-tests.patch")) + "12r1ldq4l032d6f5gc22dlayck4cr29cczqsl9xf0vdm9anzml40")) (modules '((guix build utils))) (snippet '(begin @@ -58,18 +58,31 @@ (with-directory-excursion "Utilities" (for-each delete-file-recursively '("cmbzip2" - ;"cmcompress" + ;; "cmcompress" "cmcurl" "cmexpat" - ;"cmjsoncpp" - ;"cmlibarchive" + ;; "cmjsoncpp" + ;; "cmlibarchive" "cmliblzma" - "cmlibuv" + ;; "cmlibuv" "cmzlib")) #t))))) (build-system gnu-build-system) (arguments `(#:test-target "test" + #:make-flags + (let ((skipped-tests + (list "BundleUtilities" ; This test fails on Guix. + "CTestTestSubdir" ; This test fails to build 2 of the 3 tests. + "CMake.String" ; This test depends on clock being set to + ; current time, which is not the case in + ; the build environment. + ;; These tests requires network access. + "CTestCoverageCollectGCOV" + "CTestTestUpload"))) + (list + (string-append + "ARGS=--exclude-regex ^\\(" (string-join skipped-tests "\\|") "\\)$"))) #:phases (modify-phases %standard-phases (add-before 'configure 'patch-bin-sh @@ -78,8 +91,6 @@ ;; files. (substitute* '("Modules/CompilerId/Xcode-3.pbxproj.in" - "Modules/CompilerId/Xcode-1.pbxproj.in" - "Modules/CompilerId/Xcode-2.pbxproj.in" "Modules/CPack.RuntimeScript.in" "Source/cmakexbuild.cxx" "Source/cmGlobalXCodeGenerator.cxx" @@ -102,43 +113,45 @@ (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (zero? (system* - "./configure" - (string-append "--prefix=" out) - "--system-libs" - "--no-system-jsoncpp" ; FIXME: Circular dependency. - ;; By default, the man pages and other docs land - ;; in PREFIX/man and PREFIX/doc, but we want them - ;; in share/{man,doc}. Note that unlike - ;; autoconf-generated configure scripts, cmake's - ;; configure prepends "PREFIX/" to what we pass - ;; to --mandir and --docdir. - "--mandir=share/man" - ,(string-append - "--docdir=share/doc/cmake-" - (version-major+minor version))))))) + (invoke + "./configure" + (string-append "--prefix=" out) + "--system-libs" + "--no-system-jsoncpp" ; FIXME: Circular dependency. + ;; By default, the man pages and other docs land + ;; in PREFIX/man and PREFIX/doc, but we want them + ;; in share/{man,doc}. Note that unlike + ;; autoconf-generated configure scripts, cmake's + ;; configure prepends "PREFIX/" to what we pass + ;; to --mandir and --docdir. + "--mandir=share/man" + ,(string-append + "--docdir=share/doc/cmake-" + (version-major+minor version)))))) (add-before 'check 'set-test-environment (lambda _ ;; Get verbose output from failed tests. (setenv "CTEST_OUTPUT_ON_FAILURE" "TRUE") + ;; Parallel tests fail in the 3.10.2 release. ;; Run tests in parallel. - (setenv "CTEST_PARALLEL_LEVEL" - (number->string (parallel-job-count))) + ;; (setenv "CTEST_PARALLEL_LEVEL" + ;; (number->string (parallel-job-count))) #t))))) (inputs - `(("file" ,file) - ("curl" ,curl) - ("zlib" ,zlib) - ("expat" ,expat) - ("bzip2" ,bzip2) - ("ncurses" ,ncurses) ; required for ccmake - ("libuv" ,libuv) - ("libarchive" ,libarchive))) + `(("bzip2" ,bzip2) + ("curl" ,curl) + ("expat" ,expat) + ("file" ,file) + ("libarchive" ,libarchive) + ("libuv" ,libuv) + ("ncurses" ,ncurses) ; required for ccmake + ("rhash" ,rhash) + ("zlib" ,zlib))) (native-search-paths (list (search-path-specification - (variable "CMAKE_PREFIX_PATH") - (files '(""))))) - (home-page "https://www.cmake.org/") + (variable "CMAKE_PREFIX_PATH") + (files '(""))))) + (home-page "https://cmake.org/") (synopsis "Cross-platform build system") (description "CMake is a family of tools designed to build, test and package software. -- cgit 1.4.1 From 12420c800e91026ea884c9643ff0df2d2e59d7f9 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 24 Feb 2018 18:18:08 +0530 Subject: gnu: cmake: Re-indent. * gnu/packages/cmake.scm (cmake): Re-indent. --- gnu/packages/cmake.scm | 80 +++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) (limited to 'gnu/packages/cmake.scm') diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index d5022dc741..ff011c7c14 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -44,29 +44,29 @@ (name "cmake") (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 - "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))))) + (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" @@ -75,8 +75,8 @@ (list "BundleUtilities" ; This test fails on Guix. "CTestTestSubdir" ; This test fails to build 2 of the 3 tests. "CMake.String" ; This test depends on clock being set to - ; current time, which is not the case in - ; the build environment. + ; current time, which is not the case in + ; the build environment. ;; These tests requires network access. "CTestCoverageCollectGCOV" "CTestTestUpload"))) @@ -87,22 +87,22 @@ (modify-phases %standard-phases (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/CPack.RuntimeScript.in" - "Source/cmakexbuild.cxx" - "Source/cmGlobalXCodeGenerator.cxx" - "Source/CTest/cmCTestBatchTestHandler.cxx" - "Source/cmLocalUnixMakefileGenerator3.cxx" - "Source/cmExecProgramCommand.cxx" - "Utilities/Release/release_cmake.cmake" - "Utilities/cmlibarchive/libarchive/archive_write_set_format_shar.c" - "Tests/CMakeLists.txt" - "Tests/RunCMake/File_Generate/RunCMakeTest.cmake") + ;; Replace "/bin/sh" by the right path in... a lot of + ;; files. + (substitute* + '("Modules/CompilerId/Xcode-3.pbxproj.in" + "Modules/CPack.RuntimeScript.in" + "Source/cmakexbuild.cxx" + "Source/cmGlobalXCodeGenerator.cxx" + "Source/CTest/cmCTestBatchTestHandler.cxx" + "Source/cmLocalUnixMakefileGenerator3.cxx" + "Source/cmExecProgramCommand.cxx" + "Utilities/Release/release_cmake.cmake" + "Utilities/cmlibarchive/libarchive/archive_write_set_format_shar.c" + "Tests/CMakeLists.txt" + "Tests/RunCMake/File_Generate/RunCMakeTest.cmake") (("/bin/sh") (which "sh"))) - #t)) + #t)) (add-before 'configure 'set-paths (lambda _ ;; Help cmake's bootstrap process to find system libraries -- cgit 1.4.1 From 12cb6c31df4b90d58658e88a256e36b6808e1064 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 29 Mar 2018 16:48:35 +0200 Subject: gnu: cmake: Update to 3.11.0. * gnu/packages/cmake.scm (cmake): Update to 3.11.0. [arguments]: Enable fixed test. Adjust file substitutions. Run tests and "./configure" in parallel. (cmake-3.11): Remove variable. * gnu/packages/storage.scm (ceph)[arguments]: Remove #:cmake. --- gnu/packages/cmake.scm | 83 ++++++------------------------------------------ gnu/packages/storage.scm | 2 -- 2 files changed, 9 insertions(+), 76 deletions(-) (limited to 'gnu/packages/cmake.scm') diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index ff011c7c14..e9fa866411 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -42,7 +42,7 @@ (define-public cmake (package (name "cmake") - (version "3.10.2") + (version "3.11.0") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -50,7 +50,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "12r1ldq4l032d6f5gc22dlayck4cr29cczqsl9xf0vdm9anzml40")) + "0sv5k9q6braa8hhw0y3w19avqn0xn5czv5jf5fz5blnlf7ivw4y3")) (modules '((guix build utils))) (snippet '(begin @@ -74,15 +74,15 @@ (let ((skipped-tests (list "BundleUtilities" ; This test fails on Guix. "CTestTestSubdir" ; This test fails to build 2 of the 3 tests. - "CMake.String" ; This test depends on clock being set to - ; current time, which is not the case in - ; the build environment. ;; These tests requires network access. "CTestCoverageCollectGCOV" "CTestTestUpload"))) (list (string-append - "ARGS=--exclude-regex ^\\(" (string-join skipped-tests "\\|") "\\)$"))) + ;; These arguments apply for the tests only. + "ARGS=-j " (number->string (parallel-job-count)) + " --output-on-failure" + " --exclude-regex ^\\(" (string-join skipped-tests "\\|") "\\)$"))) #:phases (modify-phases %standard-phases (add-before 'configure 'patch-bin-sh @@ -94,7 +94,6 @@ "Modules/CPack.RuntimeScript.in" "Source/cmakexbuild.cxx" "Source/cmGlobalXCodeGenerator.cxx" - "Source/CTest/cmCTestBatchTestHandler.cxx" "Source/cmLocalUnixMakefileGenerator3.cxx" "Source/cmExecProgramCommand.cxx" "Utilities/Release/release_cmake.cmake" @@ -114,7 +113,8 @@ (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (invoke - "./configure" + "./configure" "--verbose" + (string-append "--parallel=" (number->string (parallel-job-count))) (string-append "--prefix=" out) "--system-libs" "--no-system-jsoncpp" ; FIXME: Circular dependency. @@ -127,16 +127,7 @@ "--mandir=share/man" ,(string-append "--docdir=share/doc/cmake-" - (version-major+minor version)))))) - (add-before 'check 'set-test-environment - (lambda _ - ;; Get verbose output from failed tests. - (setenv "CTEST_OUTPUT_ON_FAILURE" "TRUE") - ;; Parallel tests fail in the 3.10.2 release. - ;; Run tests in parallel. - ;; (setenv "CTEST_PARALLEL_LEVEL" - ;; (number->string (parallel-job-count))) - #t))))) + (version-major+minor version))))))))) (inputs `(("bzip2" ,bzip2) ("curl" ,curl) @@ -163,59 +154,3 @@ and workspaces that can be used in the compiler environment of your choice.") license:bsd-2 ; cmlibarchive license:expat ; cmjsoncpp is dual MIT/public domain license:public-domain)))) ; cmlibarchive/archive_getdate.c - -;; Recent Ceph requires Boost 1.66, which in turn requires CMake 3.11 for -;; its updated "FindBoost.cmake" facility. -(define-public cmake-3.11 - (package - (inherit cmake) - (version "3.11.0-rc2") - (source (origin - (inherit (package-source cmake)) - (uri (string-append "https://www.cmake.org/files/v" - (version-major+minor version) - "/cmake-" version ".tar.gz")) - (sha256 - (base32 - "14p6ais19nfcwl914n4n5rbzaqwafv3qkg6nd8jw54ykn6lz6mf3")) - (snippet - '(begin - ;; Drop bundled software. - (with-directory-excursion "Utilities" - (for-each delete-file-recursively - '("cmbzip2" - "cmcurl" - "cmexpat" - "cmliblzma" - "cmzlib")) - #t))))) - (build-system gnu-build-system) - (arguments - (substitute-keyword-arguments (package-arguments cmake) - ((#:make-flags flags ''()) `(cons (string-append - "ARGS=-j " - (number->string (parallel-job-count)) - " --output-on-failure") - ,flags)) - ((#:phases phases) - `(modify-phases ,phases - (replace 'patch-bin-sh - (lambda _ - (substitute* - '("Modules/CompilerId/Xcode-3.pbxproj.in" - "Modules/CPack.RuntimeScript.in" - "Source/cmakexbuild.cxx" - "Source/cmGlobalXCodeGenerator.cxx" - "Source/cmLocalUnixMakefileGenerator3.cxx" - "Source/cmExecProgramCommand.cxx" - "Utilities/Release/release_cmake.cmake" - "Utilities/cmlibarchive/libarchive/archive_write_set_format_shar.c" - "Tests/CMakeLists.txt" - "Tests/RunCMake/File_Generate/RunCMakeTest.cmake") - (("/bin/sh") (which "sh"))) - #t)) - ;; This is now passed through #:make-flags. - (delete 'set-test-environment))))) - (inputs - `(("rhash" ,rhash) - ,@(package-inputs cmake))))) diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index 93db2189e3..9882a4ec34 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -29,7 +29,6 @@ #:use-module (gnu packages bdw-gc) #:use-module (gnu packages boost) #:use-module (gnu packages check) - #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages cryptsetup) @@ -116,7 +115,6 @@ ;; for details. Disable tests until ;; resolved. #:tests? #f - #:cmake ,cmake-3.11 #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source -- cgit 1.4.1 From f037673c3133ae7453794f1f62eecebf9d06b092 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 22 May 2018 07:41:45 +0300 Subject: gnu: cmake: Delete Emacs library. * gnu/packages/finance.scm (cmake)[arguments]: Delete Emacs library. --- gnu/packages/cmake.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/cmake.scm') diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index e9fa866411..c8f6f77b3a 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -85,6 +85,12 @@ " --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.*") "")))) (add-before 'configure 'patch-bin-sh (lambda _ ;; Replace "/bin/sh" by the right path in... a lot of -- cgit 1.4.1 From bbdf36666b82eae0a583d7124d8117801969570c Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 18 May 2018 15:25:39 +0300 Subject: gnu: Add emacs-cmake-mode. * gnu/packages/cmake.scm (emacs-cmake-mode): New public variable. --- gnu/packages/cmake.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages/cmake.scm') diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index e6c5c4e793..eba7a92c04 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -206,3 +206,20 @@ and workspaces that can be used in the compiler environment of your choice.") (inputs `(("rhash" ,rhash) ,@(package-inputs cmake))))) + +(define-public emacs-cmake-mode + (package + (inherit cmake) + (name "emacs-cmake-mode") + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir-elisp + ;; Elisp directory is not in root of the source. + (lambda _ + (chdir "Auxiliary")))))) + (synopsis "Emacs major mode for editing Cmake expressions") + (description "@code{cmakeos-mode} provides an Emacs major mode for editing +Cmake files. It supports syntax highlighting, indenting and refilling of +comments."))) -- cgit 1.4.1 From aa4818c33b6b2fd8d602ee93a2f53005d9472f41 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 22 May 2018 17:36:29 +0300 Subject: gnu: cmake.scm: Add missing module. * gnu/packages/cmake.scm: Import emacs-build-system. --- gnu/packages/cmake.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/cmake.scm') diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index eba7a92c04..258ea9c638 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -28,6 +28,7 @@ #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system emacs) #:use-module (gnu packages) #:use-module (gnu packages backup) #:use-module (gnu packages compression) -- cgit 1.4.1 From 4935701a4a31212e0cf1b2375832fb7ecd3d8809 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 22 May 2018 14:39:53 -0400 Subject: Revert "gnu: cmake: Delete Emacs library." This reverts commit f037673c3133ae7453794f1f62eecebf9d06b092. --- gnu/packages/cmake.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnu/packages/cmake.scm') diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index c8f6f77b3a..e9fa866411 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -85,12 +85,6 @@ " --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.*") "")))) (add-before 'configure 'patch-bin-sh (lambda _ ;; Replace "/bin/sh" by the right path in... a lot of -- cgit 1.4.1