[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/64: gnu: cmake: Fix cross-compilation.
From: |
guix-commits |
Subject: |
12/64: gnu: cmake: Fix cross-compilation. |
Date: |
Fri, 23 Aug 2019 04:10:16 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit feca1111b3159892e74176620fe7685396aeff33
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 1d8d829..9bf0273 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -207,6 +207,14 @@ and workspaces that can be used in the compiler
environment of your choice.")
(outputs '("out" "doc"))
(properties (alist-delete 'hidden? (package-properties cmake-minimal)))))
+(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."
- 37/64: gnu: openldap: Fix cross-compilation., (continued)
- 37/64: gnu: openldap: Fix cross-compilation., guix-commits, 2019/08/23
- 57/64: gnu: linux-libre: Enable built-in ext4 support., guix-commits, 2019/08/23
- 61/64: build: vm: Fix arm32 support., guix-commits, 2019/08/23
- 16/64: gnu: groff: Fix cross compilation., guix-commits, 2019/08/23
- 34/64: gnu: lvm2: Fix cross-compilation., guix-commits, 2019/08/23
- 36/64: gnu: bdb: Fix cross-compilation., guix-commits, 2019/08/23
- 40/64: gnu: make-linux-libre: Fix cross-compilation., guix-commits, 2019/08/23
- 62/64: system: vm: Add arm64 support., guix-commits, 2019/08/23
- 15/64: gnu: libpaper: Fix aarch64 cross-compilation., guix-commits, 2019/08/23
- 14/64: gnu: ath9k-htc-firmware: Fix cross compilation., guix-commits, 2019/08/23
- 12/64: gnu: cmake: Fix cross-compilation.,
guix-commits <=
- 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, 2019/08/23
- 18/64: gnu: bc: Fix cross-compilation., guix-commits, 2019/08/23