[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
95/104: gnu: qemu-minimal: Use 'match' to find architecture.
From: |
guix-commits |
Subject: |
95/104: gnu: qemu-minimal: Use 'match' to find architecture. |
Date: |
Sun, 17 May 2020 11:36:52 -0400 (EDT) |
nckx pushed a commit to branch core-updates
in repository guix.
commit 5714ed455d6ba312d146b09e2a50b5c46fdf9dd1
Author: Efraim Flashner <address@hidden>
AuthorDate: Sun May 17 10:13:41 2020 +0300
gnu: qemu-minimal: Use 'match' to find architecture.
* gnu/packages/virtualization.scm (qemu-minimal)[arguments]: Use 'match'
to target the correct architecture.
---
gnu/packages/virtualization.scm | 56 ++++++++++++++++++++---------------------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 371104c..c2025c4 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -312,34 +312,34 @@ server and embedded PowerPC, and S390 guests.")
(substitute-keyword-arguments (package-arguments qemu)
((#:configure-flags _ '(list))
;; Restrict to the host's architecture.
- (let ((arch (car (string-split (or (%current-target-system)
- (%current-system))
- #\-))))
- (cond ((string=? arch "i686")
- '(list "--target-list=i386-softmmu"))
- ((string-prefix? "x86_64" arch)
- '(list "--target-list=i386-softmmu,x86_64-softmmu"))
- ((string-prefix? "mips64" arch)
- '(list (string-append
"--target-list=mips-softmmu,mipsel-softmmu,"
- "mips64-softmmu,mips64el-softmmu")))
- ((string-prefix? "mips" arch)
- '(list "--target-list=mips-softmmu,mipsel-softmmu"))
- ((string-prefix? "aarch64" arch)
- '(list "--target-list=arm-softmmu,aarch64-softmmu"))
- ((string-prefix? "arm" arch)
- '(list "--target-list=arm-softmmu"))
- ((string-prefix? "alpha" arch)
- '(list "--target-list=alpha-softmmu"))
- ((string-prefix? "powerpc64" arch)
- '(list "--target-list=ppc-softmmu,ppc64-softmmu"))
- ((string-prefix? "powerpc" arch)
- '(list "--target-list=ppc-softmmu"))
- ((string-prefix? "s390" arch)
- '(list "--target-list=s390x-softmmu"))
- ((string-prefix? "riscv" arch)
- '(list "--target-list=riscv32-softmmu,riscv64-softmmu"))
- (else ; An empty list actually builds all the targets.
- ''()))))))
+ (match (car (string-split (or (%current-target-system)
+ (%current-system))
+ #\-))
+ ("i686"
+ '(list "--target-list=i386-softmmu"))
+ ("x86_64"
+ '(list "--target-list=i386-softmmu,x86_64-softmmu"))
+ ("mips64"
+ '(list (string-append "--target-list=mips-softmmu,mipsel-softmmu,"
+ "mips64-softmmu,mips64el-softmmu")))
+ ("mips"
+ '(list "--target-list=mips-softmmu,mipsel-softmmu"))
+ ("aarch64"
+ '(list "--target-list=arm-softmmu,aarch64-softmmu"))
+ ("arm"
+ '(list "--target-list=arm-softmmu"))
+ ("alpha"
+ '(list "--target-list=alpha-softmmu"))
+ ("powerpc64"
+ '(list "--target-list=ppc-softmmu,ppc64-softmmu"))
+ ("powerpc"
+ '(list "--target-list=ppc-softmmu"))
+ ("s390"
+ '(list "--target-list=s390x-softmmu"))
+ ("riscv"
+ '(list "--target-list=riscv32-softmmu,riscv64-softmmu"))
+ (else ; 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)
- 85/104: gnu: java-jmapviewer: Return #t from all phases., (continued)
- 85/104: gnu: java-jmapviewer: Return #t from all phases., guix-commits, 2020/05/17
- 91/104: gnu: alpine: Update to 2.22., guix-commits, 2020/05/17
- 101/104: gnu: cups: Update to 2.3.3 [fixes CVE-2020-3898 & CVE-2019-8842]., guix-commits, 2020/05/17
- 103/104: gnu: cups, cups-minimal: Ungraft 2.3.3., guix-commits, 2020/05/17
- 104/104: gnu: cups-filters: Update to 1.27.4., guix-commits, 2020/05/17
- 87/104: gnu: julius: Update to 1.4.0., guix-commits, 2020/05/17
- 96/104: gnu: racket: Update to 7.7., guix-commits, 2020/05/17
- 102/104: etc: Install mount unit only if it exists., guix-commits, 2020/05/17
- 80/104: gnu: synthv1: Update to 0.9.14., guix-commits, 2020/05/17
- 94/104: doc: meson-build-system: Fix build type documentation., guix-commits, 2020/05/17
- 95/104: gnu: qemu-minimal: Use 'match' to find architecture.,
guix-commits <=
- 97/104: gnu: kdeconnect: Fix kdeconnectd path., guix-commits, 2020/05/17
- 98/104: gnu: acpica: Update to 20200430., guix-commits, 2020/05/17
- 99/104: gnu: acpica: Fix typo in synopsis., guix-commits, 2020/05/17
- 100/104: gnu: acpica: Drop Texinfo @dfn{} usage., guix-commits, 2020/05/17