[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
50/61: gnu: cmake: Fix cross-compilation.
From: |
guix-commits |
Subject: |
50/61: gnu: cmake: Fix cross-compilation. |
Date: |
Wed, 21 Aug 2019 04:24:56 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit 63621a13c8a5e8615b73c5d0705cf3e18d9dc1dc
Author: Pierre-Moana Levesque <address@hidden>
Date: Mon Aug 5 22:50:54 2019 +0200
gnu: cmake: Fix cross-compilation.
* gnu/packages/cmake.scm (cmake-minimal)[inputs]: Move all inputs to ...
[native-inputs]: ... here, except for ncurses.
---
gnu/packages/cmake.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index 9bf0273..cae66f2 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2018 Arun Isaac <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2019 Maxim Cournoyer <address@hidden>
+;;; Copyright © 2019 Pierre-Moana Levesque <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -145,16 +146,17 @@
(replace 'configure
(lambda* (#:key (configure-flags '()) #:allow-other-keys)
(apply invoke "./configure" configure-flags))))))
- (inputs
+ (native-inputs
`(("bzip2" ,bzip2)
("curl" ,curl)
("expat" ,expat)
("file" ,file)
("libarchive" ,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")
- 35/61: gnu: nghttp2: Fix cross-compilation., (continued)
- 35/61: gnu: nghttp2: Fix cross-compilation., guix-commits, 2019/08/21
- 36/61: gnu: openldap: Fix cross-compilation., guix-commits, 2019/08/21
- 37/61: gnu: swig: Fix cross-compilation., guix-commits, 2019/08/21
- 18/61: gnu: bc: Fix cross-compilation., guix-commits, 2019/08/21
- 38/61: gnu: git: Fix cross-compilation., guix-commits, 2019/08/21
- 47/61: gnu: crda: Fix cross-compilation, guix-commits, 2019/08/21
- 46/61: gnu: libnl: Fix cross-compilation., guix-commits, 2019/08/21
- 45/61: gnu: texinfo-4: Fix cross compilation, guix-commits, 2019/08/21
- 49/61: gnu: guile-wm: Fix cross-compilation., guix-commits, 2019/08/21
- 44/61: gnu: libtool: Fix cross-compilation., guix-commits, 2019/08/21
- 50/61: gnu: cmake: Fix cross-compilation.,
guix-commits <=
- 55/61: gnu: linux-libre: Enable built-in ext4 support., guix-commits, 2019/08/21
- 58/61: utils: Use target-arm64? and target-arm? helpers., guix-commits, 2019/08/21
- 52/61: gnu: mdadm: Fix cross-compilation., guix-commits, 2019/08/21
- 54/61: linux-initrd: Use native gzip., guix-commits, 2019/08/21
- 60/61: system: vm: Support cross-compilation., guix-commits, 2019/08/21
- 57/61: gexp: Pass target to compiled-modules in lower-gexp., guix-commits, 2019/08/21