From: Arun Isaac <arunisaac@systemreboot.net>
To: 30390@debbugs.gnu.org
Subject: [bug#30390] [PATCH 3/3] gnu: cmake: Re-indent.
Date: Sat, 24 Feb 2018 18:38:49 +0530 [thread overview]
Message-ID: <20180224130849.8886-4-arunisaac@systemreboot.net> (raw)
In-Reply-To: <20180224130849.8886-1-arunisaac@systemreboot.net>
* gnu/packages/cmake.scm (cmake): Re-indent.
---
gnu/packages/cmake.scm | 80 +++++++++++++++++++++++++-------------------------
1 file changed, 40 insertions(+), 40 deletions(-)
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index 3f254b6f8..549a87621 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
--
2.15.1
next prev parent reply other threads:[~2018-02-24 13:10 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-08 12:13 [bug#30390] [PATCH 0/3] Update cmake to 3.10.2 Arun Isaac
2018-02-08 12:17 ` [bug#30390] [PATCH 1/3] gnu: Add rhash Arun Isaac
2018-02-08 12:17 ` [bug#30390] [PATCH 2/3] gnu: libuv: Update to 1.19.1 Arun Isaac
2018-02-20 17:46 ` Marius Bakke
2018-02-08 12:17 ` [bug#30390] [PATCH 3/3] gnu: cmake: Update to 3.10.2 Arun Isaac
2018-02-20 17:54 ` Marius Bakke
2018-02-20 17:44 ` [bug#30390] [PATCH 1/3] gnu: Add rhash Marius Bakke
2018-02-22 14:42 ` Arun Isaac
2018-02-22 14:48 ` Marius Bakke
2018-02-24 13:08 ` [bug#30390] [PATCH 0/3] Update cmake Arun Isaac
2018-02-24 13:08 ` [bug#30390] [PATCH 1/3] gnu: sqlite: Fix source URI Arun Isaac
2018-02-24 13:08 ` [bug#30390] [PATCH 2/3] gnu: cmake: Update to 3.10.2 Arun Isaac
2018-02-24 13:08 ` Arun Isaac [this message]
2018-02-24 15:16 ` [bug#30390] [PATCH 0/3] Update cmake Marius Bakke
2018-02-24 19:06 ` Arun Isaac
2018-02-24 21:17 ` Marius Bakke
2018-02-27 17:20 ` Ludovic Courtès
2018-02-24 15:19 ` Marius Bakke
2018-03-20 10:41 ` Marius Bakke
2018-03-21 21:38 ` Arun Isaac
2018-03-23 6:25 ` bug#30390: " Arun Isaac
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180224130849.8886-4-arunisaac@systemreboot.net \
--to=arunisaac@systemreboot.net \
--cc=30390@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).