From patchwork Tue Aug 17 10:19:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32150 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C781A27BC78; Tue, 17 Aug 2021 11:26:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7F18327BC6B for ; Tue, 17 Aug 2021 11:26:15 +0100 (BST) Received: from localhost ([::1]:60506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwIQ-0004ra-IZ for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:26:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwIF-0004oo-HM for guix-patches@gnu.org; Tue, 17 Aug 2021 06:26:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40258) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwIF-0007Dz-9P for guix-patches@gnu.org; Tue, 17 Aug 2021 06:26:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwIF-0004IA-61 for guix-patches@gnu.org; Tue, 17 Aug 2021 06:26:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 07/21] gnu: bdb: Fix building on riscv64-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:26:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919590715857 (code B ref 50091); Tue, 17 Aug 2021 10:26:03 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:25:07 +0000 Received: from localhost ([127.0.0.1]:51793 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwHG-00046r-HY for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:25:07 -0400 Received: from flashner.co.il ([178.62.234.194]:45924) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwHA-00045u-5R for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:25:00 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id 82A99402E0; Tue, 17 Aug 2021 10:24:50 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:05 +0300 Message-Id: <975888973eb4debf457d394fc3669a36168566ac.1629193993.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 ce84ef9eda..c2bdaf782a 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 ;;; Copyright © 2013, 2015 Andreas Enge -;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2020, 2021 Efraim Flashner ;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2018 Mark H Weaver ;;; Copyright © 2020 Jakub Kądziołka @@ -28,7 +28,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: ;;; @@ -72,15 +73,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))