[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/09: gnu: cmake: Fix cross-compilation.
From: |
guix-commits |
Subject: |
09/09: gnu: cmake: Fix cross-compilation. |
Date: |
Sun, 26 Jan 2020 07:46:14 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit ac841750a52e44d68d7f1b02e9507421f3e3824f
Author: Marius Bakke <address@hidden>
AuthorDate: Sun Jan 26 13:15:55 2020 +0100
gnu: cmake: Fix cross-compilation.
* gnu/packages/cmake.scm (cmake-bootstrap)[native-inputs]: Move everything
except (PACKAGE-SOURCE LIBARCHIVE) ...
[inputs]: ... here.
* gnu/packages/cmake.scm (cmake-minimal)[native-inputs, inputs]: Adjust
accordingly.
---
gnu/packages/cmake.scm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index 93a71e1..cc4340b 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -197,17 +197,17 @@
(lambda* (#:key (configure-flags '()) #:allow-other-keys)
(apply invoke "./configure" configure-flags))))))
(native-inputs
+ `(("libarchive:source" ,(package-source libarchive))))
+ (inputs
`(("bzip2" ,bzip2)
("curl" ,curl-minimal)
("expat" ,expat)
("file" ,file)
("libarchive" ,libarchive)
- ("libarchive:source" ,(package-source libarchive))
("libuv" ,libuv)
+ ("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")
@@ -252,10 +252,10 @@ and workspaces that can be used in the compiler
environment of your choice.")
'("Utilities/cmjsoncpp"
"Utilities/cmlibuv")))
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
`(#:configure-flags
- branch core-updates updated (ed24dda -> ac84175), guix-commits, 2020/01/26
- 03/09: gnu: cmake: Remove bundled LibUV., guix-commits, 2020/01/26
- 01/09: build-system/cmake: Enable parallel tests by default., guix-commits, 2020/01/26
- 05/09: gnu: libjpeg-turbo: Fix cross-compilation., guix-commits, 2020/01/26
- 02/09: gnu: cmake, cmake-minimal: Use cmake-build-system., guix-commits, 2020/01/26
- 07/09: gnu: jsoncpp: Fix cross-compilation., guix-commits, 2020/01/26
- 06/09: build-system/cmake: Specify C++ compiler when cross-compiling., guix-commits, 2020/01/26
- 09/09: gnu: cmake: Fix cross-compilation.,
guix-commits <=
- 04/09: gnu: cmake: Enable debugging information., guix-commits, 2020/01/26
- 08/09: gnu: rhash: Fix cross-compilation., guix-commits, 2020/01/26