efraim pushed a commit to branch wip-riscv
in repository guix.
commit 5327cf94e549169b39b69f8b314ca4242eba76a2
Author: Efraim Flashner <[email protected]>
AuthorDate: Fri Jul 30 13:46:43 2021 +0300
gnu: bdb: Fix building on riscv64-linux.
* gnu/packages/dbm.scm (bdb)[arguments]: Modify configure to build for
the currect architecture when building for riscv64-linux.
---
gnu/packages/dbm.scm | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/dbm.scm b/gnu/packages/dbm.scm
index 607e4ae..52938df 100644
--- a/gnu/packages/dbm.scm
+++ b/gnu/packages/dbm.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2016, 2020 Ludovic Courtès <[email protected]>
;;; Copyright © 2013, 2015 Andreas Enge <[email protected]>
-;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <[email protected]>
+;;; Copyright © 2016, 2017, 2018, 2020, 2021 Efraim Flashner
<[email protected]>
;;; Copyright © 2017, 2018 Marius Bakke <[email protected]>
;;; Copyright © 2018 Mark H Weaver <[email protected]>
;;; Copyright © 2020 Jakub Kądziołka <[email protected]>
@@ -30,7 +30,8 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
- #:use-module (guix utils))
+ #:use-module (guix utils)
+ #:use-module (ice-9 match))
;;; Commentary:
;;;
@@ -87,15 +88,15 @@
(string-append "CONFIG_SHELL=" (which "bash"))
(string-append "SHELL=" (which "bash"))
- ;; Bdb doesn't recognize aarch64 as an architecture.
- ,@(if (string=? "aarch64-linux" (%current-system))
- '("--build=aarch64-unknown-linux-gnu")
- '())
-
- ;; Bdb doesn't recognize powerpc64le as an architecture.
- ,@(if (string=? "powerpc64le-linux" (%current-system))
- '("--build=powerpc64le-unknown-linux-gnu")
- '())
+ ;; Bdb doesn't recognize very many architectures.
+ ,@(match (%current-system)
+ ("aarch64-linux"
+ '("--build=aarch64-unknown-linux-gnu"))
+ ("powerpc64le-linux"
+ '("--build=powerpc64le-unknown-linux-gnu"))
+ ("riscv64-linux"
+ '("--build=riscv64-unknown-linux-gnu"))
+ (_ '()))
,@(if (%current-target-system) ; cross building
'((string-append "--host=" target))
