From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id GHOfOVqGJmGmmQAAgWs5BA (envelope-from ) for ; Wed, 25 Aug 2021 20:05:14 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 4KU6NVqGJmEFbQAAB5/wlQ (envelope-from ) for ; Wed, 25 Aug 2021 18:05:14 +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 9B5237058 for ; Wed, 25 Aug 2021 20:05:14 +0200 (CEST) Received: from localhost ([::1]:58604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxGz-0001ZO-Jv for larch@yhetil.org; Wed, 25 Aug 2021 14:05:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58482) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxG0-00085h-Ot for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36185) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxFy-0000ua-Lv for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxFy-0002p1-Hd for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 18/52] gnu: bdb: Fix cross-compilation build errors. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:04:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50201@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50201-submit@debbugs.gnu.org id=B50201.162991464310692 (code B ref 50201); Wed, 25 Aug 2021 18:04:10 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:04:03 +0000 Received: from localhost ([127.0.0.1]:47703 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFq-0002m9-5G for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:04:02 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:50690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFY-0002fp-Tj for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:46 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id lu3d2500J0mfAB406u3kUa; Wed, 25 Aug 2021 20:03:44 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:02:58 +0200 Message-Id: <20210825180332.5720-18-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210825180332.5720-1-maximedevos@telenet.be> References: <20210825180332.5720-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629914624; bh=H1PPophH4rr1IUQEZXgGaqfqBQuITGY28xk7BK6DEZs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Dj5OApMHKU7ReKVIyLnycrOd0yaly+jpGTAUaI0QykIcpfr+iL9JJS7IaAd6LYpGC oxmCGNyizZHusIQjjqzzfTX3zqvczO579Qh5Ol+M8q78h1i4m1FSnEzNQ2Zo0VPcRG ruAfKcsjaMvMGJ99btQzxk8rvy6/zj/kTA2+dNx/h7s89HBFFHahRmjSnbxY9Lc/0B plriA/wSCSbUayjiVbHYtnZfIj59I3cdQ3Ny0sa2PWHlYtsj4xsnO4l9QUn0EaxGlR zX+4VBugMhEDk8sfKmgo8/MHE4WVFS76VNJPpZpAAJNaa/NoydAyV649E5tYBNbCZ7 XnITmDh8Pbvog== 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=1629914714; 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:dkim-signature; bh=H1PPophH4rr1IUQEZXgGaqfqBQuITGY28xk7BK6DEZs=; b=cCjAfkaF/2NtBiOMSiji0nM+NU1A2Q6YQI5PRu60aP9adVvTBzQlDtXw2PKyuNWqGpL9k1 2w3SfXhgDM6JK4keHPfUmBkqYZeqMx/M0a8yVRId5u4TVAIpfx5FB6hnmc2DSSn0s4zzgW FW7SD6yM58LhR4JoYFC5xSrTWiU6SEJOnAwmqiBLKrAZVQAhjBRlCyrv14ujcnh4blqDa3 FXihUVLxiDfwjEfXGhMnOL0KIaMxBfAfm2TR2lZ9WnIiX5pHN2GKQtu7oDaT6z8KOF+Ilo 2ist8kzBZ9f37aWoSCvAP/OqPyMgDNbTDw+AHZFtNDRT0xCUQdpYlAZSc3qGyA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629914714; a=rsa-sha256; cv=none; b=EwtMGfqzNhTu3mJ9dMItIhkm5TZHYn/m6nAqnC28A7SBqS+8zWL6ODVqonuZZfwgqA+xUT HTlQ7kAxEs7v82sxNAVfSLFEt5BiGTczhq78KdmZ30JYEdlOx9w7PCOhyrnLB8+V1jTLi0 xgCMrLBNSHrd8OZ7YJ4KaLYV1ZclY6ITUyQ5FV+f/TftAxvV0fpIcLUVbyOTZ8quereMhP VTzAIUFp97/h2rTLBVwPRJkRRB1iUV744jZaKl1O735BUeL3jF2qzrYrhWbh7dyXPma8zk bfKiYNX6En8F5kyCB6T4kUO0VSbgz39hUEAgLICNmP7fBnK7mUjbXX9MbnPtlg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=Dj5OApMH; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=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: -0.33 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=Dj5OApMH; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=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: 9B5237058 X-Spam-Score: -0.33 X-Migadu-Scanner: scn0.migadu.com X-TUID: dlu2898Rgtu3 * gnu/packages/dbm.scm (bdb-4.8)[arguments]<#:phases>{update-config.sub}: Update 'config.sub' when cross-compiling for 'powerpc64le' or 'aarch64'. --- gnu/packages/dbm.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/dbm.scm b/gnu/packages/dbm.scm index ce84ef9eda..607e4aecf8 100644 --- a/gnu/packages/dbm.scm +++ b/gnu/packages/dbm.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018 Mark H Weaver ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2021 Leo Le Bouter +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ (define-module (gnu packages dbm) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) @@ -57,6 +59,19 @@ #:disallowed-references ("doc") #:phases (modify-phases %standard-phases + ;; The configure script is too old to recognise aarch64 and + ;; powerpc64le as valid architectures. The trick below works + ;; for "--build", but not for "--host", so update config.sub. + ,@(if (and (%current-target-system) + (or (target-ppc64le? (%current-target-system)) + (target-aarch64? (%current-target-system)))) + `((add-after 'unpack 'update-config.sub + (lambda* (#:key native-inputs #:allow-other-keys) + (delete-file "dist/config.sub") + (symlink + (search-input-file native-inputs "/bin/config.sub") + "dist/config.sub")))) + '()) (replace 'configure (lambda* (#:key target outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) @@ -97,6 +112,12 @@ ;; of db_cxx.h into C++ files works; it leads to ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h. "--enable-cxx"))))))) + (native-inputs + (if (and (%current-target-system) + (or (target-ppc64le? (%current-target-system)) + (target-aarch64? (%current-target-system)))) + `(("config" ,config)) ; for config.sub + '())) (synopsis "Berkeley database") (description "Berkeley DB is an embeddable database allowing developers the choice of -- 2.33.0