[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/15: gnu: qemu-minimal: Only build for the host's architecture.
From: |
guix-commits |
Subject: |
11/15: gnu: qemu-minimal: Only build for the host's architecture. |
Date: |
Mon, 4 May 2020 15:42:57 -0400 (EDT) |
efraim pushed a commit to branch wip-ppc
in repository guix.
commit 1ef433247f833f8fa026dc645ca0407b9400ef91
Author: Efraim Flashner <address@hidden>
AuthorDate: Sun May 3 11:00:44 2020 +0300
gnu: qemu-minimal: Only build for the host's architecture.
* gnu/packages/virtualization.scm (qemu-minimal)[arguments]: Adjust
configure-flags so that each architecture only builds for its native
architectures.
[synopsis]: Adjust to clarify it's only for the host's architecture.
---
gnu/packages/virtualization.scm | 31 +++++++++++++++++++++++++------
1 file changed, 25 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 2254d5a..1bbe0c6 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2020 Ludovic Courtès
<address@hidden>
;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver <address@hidden>
-;;; Copyright © 2016, 2017, 2018. 2019 Efraim Flashner <address@hidden>
+;;; Copyright © 2016, 2017, 2018. 2019, 2020 Efraim Flashner <address@hidden>
;;; Copyright © 2016, 2017 Ricardo Wurmus <address@hidden>
;;; Copyright © 2017 Alex Vong <address@hidden>
;;; Copyright © 2017 Andy Patterson <address@hidden>
@@ -100,7 +100,8 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix utils)
- #:use-module (srfi srfi-1))
+ #:use-module (srfi srfi-1)
+ #:use-module (ice-9 match))
(define (qemu-patch commit file-name sha256)
"Return an origin for COMMIT."
@@ -295,15 +296,33 @@ server and embedded PowerPC, and S390 guests.")
'("mips64el-linux" "i586-gnu")))))
(define-public qemu-minimal
- ;; QEMU without GUI support.
+ ;; QEMU without GUI support, only supporting the host's architecture.
(package (inherit qemu)
(name "qemu-minimal")
- (synopsis "Machine emulator and virtualizer (without GUI)")
+ (synopsis
+ "Machine emulator and virtualizer (without GUI) for the host
architecture")
(arguments
(substitute-keyword-arguments (package-arguments qemu)
((#:configure-flags _ '(list))
- ;; Restrict to the targets supported by Guix.
-
''("--target-list=i386-softmmu,x86_64-softmmu,mips64el-softmmu,arm-softmmu,aarch64-softmmu"))))
+ ;; Restrict to the host's architecture.
+ `(,@(match (or (%current-system)
+ (%current-target-system))
+ ("x86-64-linux"
+ ''("--target-list=i386-softmmu,x86_64-softmmu"))
+ ("i686-linux"
+ ''("--target-list=i386-softmmu"))
+ ("mips64el-linux"
+ ''("--target-list=mips64el-softmmu"))
+ ("aarch64-linux"
+ ''("--target-list=arm-softmmu,aarch64-softmmu"))
+ ("armhf-linux"
+ ''("--target-list=arm-softmmu"))
+ ((or "powerpc64-linux" "powerpc64le-linux")
+ ''("--target-list=ppc-softmmu,ppc64-softmmu"))
+ ("powerpc-linux"
+ ''("--target-list=ppc-softmmu"))
+ (_ ; An empty list actually builds all the targets.
+ ''()))))))
;; Remove dependencies on optional libraries, notably GUI libraries.
(native-inputs (fold alist-delete (package-native-inputs qemu)
- 01/15: gnu: libffi: Fix building on powerpc., (continued)
- 01/15: gnu: libffi: Fix building on powerpc., guix-commits, 2020/05/04
- 02/15: FIXME: Downgrade glibc to 2.30., guix-commits, 2020/05/04
- 04/15: FIXME: allow reference to bootstrap-binaries in binutils-final, guix-commits, 2020/05/04
- 05/15: gnu: datefudge: Only use glibc-2.31 workaround on supported platforms., guix-commits, 2020/05/04
- 03/15: WIP add powerpc support, guix-commits, 2020/05/04
- 06/15: gnu: valgrind: Fix build on powerpc., guix-commits, 2020/05/04
- 07/15: gnu: icu4c: Update to 67.1., guix-commits, 2020/05/04
- 14/15: build: qemu-command: Add support for powerpc., guix-commits, 2020/05/04
- 08/15: gnu: elfutils: Skip tests on powerpc., guix-commits, 2020/05/04
- 10/15: gnu: mesa: Add support for powerpc-linux., guix-commits, 2020/05/04
- 11/15: gnu: qemu-minimal: Only build for the host's architecture.,
guix-commits <=
- 09/15: gnu: gd: Fix tests., guix-commits, 2020/05/04
- 12/15: gnu: Add mac-fdisk., guix-commits, 2020/05/04
- 15/15: WIP add powerpc kernel, guix-commits, 2020/05/04
- 13/15: gnu: american-fuzzy-lop: Add support for powerpc-linux., guix-commits, 2020/05/04