[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/22: gnu: cmake: Fix cross-compilation.
From: |
guix-commits |
Subject: |
02/22: gnu: cmake: Fix cross-compilation. |
Date: |
Fri, 15 Nov 2019 11:32:43 -0500 (EST) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit 534537e2efd7ff3d521a0c4cc60170a126d9c9f3
Author: Mathieu Othacehe <address@hidden>
Date: Tue Jul 2 15:22:16 2019 +0200
gnu: cmake: Fix cross-compilation.
* gnu/packages/cmake.scm (cmake-minimal-cross): New package.
* guix/build-system/cmake.scm (default-cmake): Add new target argument and
use
it to select cmake-minimal or cmake-minimal-cross.
(lower): Pass target to default-cmake.
---
gnu/packages/cmake.scm | 8 ++++++++
guix/build-system/cmake.scm | 9 ++++++---
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index 64349be..13252a9 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -219,6 +219,14 @@ and workspaces that can be used in the compiler
environment of your choice.")
(append (search-patches "cmake-curl-certificates.patch")
(origin-patches (package-source cmake))))))))
+(define-public cmake-minimal-cross
+ (package
+ (inherit cmake-minimal)
+ (name "cmake-minimal-cross")
+ (native-search-paths '())
+ (search-paths
+ (package-native-search-paths cmake-minimal))))
+
(define-public emacs-cmake-mode
(package
(inherit cmake)
diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm
index ca88fad..aa0f418 100644
--- a/guix/build-system/cmake.scm
+++ b/guix/build-system/cmake.scm
@@ -43,16 +43,19 @@
`((guix build cmake-build-system)
,@%gnu-build-system-modules))
-(define (default-cmake)
+(define (default-cmake target)
"Return the default CMake package."
;; Do not use `@' to avoid introducing circular dependencies.
(let ((module (resolve-interface '(gnu packages cmake))))
- (module-ref module 'cmake-minimal)))
+ (module-ref module
+ (if target
+ 'cmake-minimal-cross
+ 'cmake-minimal))))
(define* (lower name
#:key source inputs native-inputs outputs system target
- (cmake (default-cmake))
+ (cmake (default-cmake target))
#:allow-other-keys
#:rest arguments)
"Return a bag for NAME."
- branch core-updates updated (2387e2f -> e4696c6), guix-commits, 2019/11/15
- 01/22: gnu: openssl: Fix cross-compilation., guix-commits, 2019/11/15
- 02/22: gnu: cmake: Fix cross-compilation.,
guix-commits <=
- 05/22: gnu: icu4c: Fix cross-compilation., guix-commits, 2019/11/15
- 10/22: gnu: swig: Fix cross-compilation., guix-commits, 2019/11/15
- 11/22: gnu: git: Fix cross-compilation., guix-commits, 2019/11/15
- 04/22: gnu: cyrus-sasl: Fix cross-compilation., guix-commits, 2019/11/15
- 17/22: gnu: cmake: Fix cross-compilation., guix-commits, 2019/11/15
- 13/22: gnu: guile-gcrypt: Fix cross-compilation., guix-commits, 2019/11/15
- 12/22: gnu: doxygen: Fix cross-compilation., guix-commits, 2019/11/15
- 08/22: gnu: bdb: Fix cross-compilation., guix-commits, 2019/11/15
- 07/22: gnu: eudev: Fix cross-compilation., guix-commits, 2019/11/15
- 18/22: utils: Use target-aarch64? and target-arm? helpers., guix-commits, 2019/11/15