[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
52/64: gnu: cmake: Fix cross-compilation.
From: |
guix-commits |
Subject: |
52/64: gnu: cmake: Fix cross-compilation. |
Date: |
Fri, 23 Aug 2019 04:10:24 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit 3714aa14a690c4539daddf3ae3ec32904431884c
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")
- 14/64: gnu: ath9k-htc-firmware: Fix cross compilation., (continued)
- 14/64: gnu: ath9k-htc-firmware: Fix cross compilation., guix-commits, 2019/08/23
- 12/64: gnu: cmake: Fix cross-compilation., guix-commits, 2019/08/23
- 32/64: gnu: boost: Fix cross-compilation., guix-commits, 2019/08/23
- 39/64: gnu: git: Fix cross-compilation., guix-commits, 2019/08/23
- 50/64: gnu: guile-xcb: Fix cross-compilation., guix-commits, 2019/08/23
- 49/64: gnu: crda: Fix cross-compilation, guix-commits, 2019/08/23
- 55/64: gnu: grub: Fix cross-compilation., guix-commits, 2019/08/23
- 46/64: gnu: texinfo-4: Fix cross compilation, guix-commits, 2019/08/23
- 53/64: gnu: console-setup: Fix cross-compilation., guix-commits, 2019/08/23
- 58/64: gexp: Use cross extensions when cross-compiling., guix-commits, 2019/08/23
- 52/64: gnu: cmake: Fix cross-compilation.,
guix-commits <=
- 18/64: gnu: bc: Fix cross-compilation., guix-commits, 2019/08/23
- 08/64: gnu: python: Further cross-compilation fixes., guix-commits, 2019/08/23
- 21/64: gnu: mit-krb5: Fix cross-compilation., guix-commits, 2019/08/23
- 23/64: gnu: help2man: Fix cross-compilation., guix-commits, 2019/08/23
- 30/64: gnu: icu4c: Fix cross-compilation., guix-commits, 2019/08/23
- 33/64: gnu: eudev: Fix cross-compilation., guix-commits, 2019/08/23
- 42/64: gnu: doxygen: Fix cross-compilation., guix-commits, 2019/08/23
- 59/64: gexp: Pass target to compiled-modules in lower-gexp., guix-commits, 2019/08/23
- 43/64: gnu: guile-sqlite3: Fix cross-compilation., guix-commits, 2019/08/23
- 60/64: utils: Use target-arm64? and target-arm? helpers., guix-commits, 2019/08/23