From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id oLqjKcSOG2EJJgAAgWs5BA (envelope-from ) for ; Tue, 17 Aug 2021 12:26:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id wB5lJcSOG2HKCQAA1q6Kng (envelope-from ) for ; Tue, 17 Aug 2021 10:26:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 138292865 for ; Tue, 17 Aug 2021 12:26:12 +0200 (CEST) Received: from localhost ([::1]:60506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwIN-0004ra-3p for larch@yhetil.org; Tue, 17 Aug 2021 06:26:11 -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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1629195972; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=ZvVHNlSWNiBgfqdwxUGh2m4d6o1jHyWpJeULekZ9as0=; b=VPo4K4jTIiXXa0BGDR8lSzvpC2jiAusX2eddOF3UP/5UKVC1quqt13cjAvr7rIiRwD1H+l aZVchRo6z11zSWIUxJejTa1XaPtVw5AMJmIiCPp4NbsBRHyMnjToVhl5ovYd9F+ohM0Ghv sJLp5+kLd5VXdjp64JS6/N4OBcsifDRcpUwVWdfk2E++EOXz7Mi2IaeMQrEW98Cs2OLC+X mG9PGaEYl+7h7tmVSHG9gk44bWOWVTyEvPuUMitFrRc9W4MyH3Sb4Dxp9m2kmqyCGHKUfc +sPvHDNkNRaNI5RuGfeKZptvVCN8OBrz1VsuY33um9olNVgGfwv/8OVWdaK7Xw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629195972; a=rsa-sha256; cv=none; b=l8H0hWZ6kE7a0/oeSweViJWYtpJZjd0eTQlTtkKtjl1tzIDmLn02ZYnApLsivBNdEZ7gV+ iqDdtKrc9osTwEPNCG7gVzGPnQU9da0L/zqOdnOt5MaFaQk+fy1gF24UlYMypOO0L+z0cA g494MQUSdgEoSl5jsUVutjUlDD9yex3sPUVTWZcPZ4UO1vly7phiYqOYfoM7ieE9jFnVRx fTNbjK42XJLNAUsIh5WL1qigwTsKj26FL8+/4866HS9Np7yynaBR9P1phUrc9ixhwFeANf P/Egr1aVLpMePckc53whqENxAJR37pMuI/LEwD7sJr6lRcB5zrhK/OoAD/bZZQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.42 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 138292865 X-Spam-Score: -1.42 X-Migadu-Scanner: scn0.migadu.com X-TUID: VaYc/53sgmVE * 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)) -- 2.32.0