From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id aB6eOkPWzGDXYwAAgWs5BA (envelope-from ) for ; Fri, 18 Jun 2021 19:22:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 4JdgNkPWzGA0RAAA1q6Kng (envelope-from ) for ; Fri, 18 Jun 2021 17:22:11 +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 929EC12154 for ; Fri, 18 Jun 2021 19:22:11 +0200 (CEST) Received: from localhost ([::1]:53052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIC2-00020k-Hq for larch@yhetil.org; Fri, 18 Jun 2021 13:22:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIAB-00083R-Lj for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46567) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIAB-0004Hb-BL for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIAB-0004uk-8E for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 12/37] libgcrypt: Fix cross-compilation build error. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20:15 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162403679418597 (code B ref 49025); Fri, 18 Jun 2021 17:20:15 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:54 +0000 Received: from localhost ([127.0.0.1]:58066 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9q-0004pn-10 for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:54 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI98-0004j9-QV for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:16 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKAby; Fri, 18 Jun 2021 19:19:10 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:06 +0200 Message-Id: <20210618171631.20534-12-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036750; bh=iyB61VxSz7o0o0YVn5/Hy/tABDE+f8iFAuqZZNSIiJo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=gFaBHPq3I8p2jQKZ1bLtAYRso6EIeNLAxcVL8aZ4CztA2Hi+LRdU3bQ/Rql9G+SwT uRnYwBrRgLUcAx/mHhyNzG/+Z2qviCuKxwC3Dg6rFJlqslZ8f25XVstMStFcSxcGca HJS6MgaNiM+0Ow5f961dg1hgNzmWI9POrNuoFH/tYcZl6UshPDLUYgUvodL/+bOGZc S4SFOT0kAklT1mWh58wYvCR6NrInRzudChfLtVHDiShcyYej/nQZQV2DZcx7/NxZq7 Hd1Tg8wbBtNDgiLyjYc+HfN5v/8rJcrEhhnMboIfbzYv0EfP5SE2K1UWkzEaHh/IZ7 nsbQkzwQcVIwQ== 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: , Reply-To: 49025@debbugs.gnu.org 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=1624036931; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=iyB61VxSz7o0o0YVn5/Hy/tABDE+f8iFAuqZZNSIiJo=; b=Wzode3fi3aL0MqdM7yhkDq65hZJcoTBAa5Ji+tTCX7MmgKvo2zo8zu0ePaIa7uG6gLP9H0 peXdLOQPAtAxeDd1fDf1dnrfHtCYaMW4WZFQG1veLsRYgA1nZIakpRo89wTCH98Vhnsc1q WUKz7Uo6edCDvln+YukU1eMseEGnr7hGYnFgMcuAhryJh9Pc606GPr+qhLmUSMwcCk9t/H oBhY4RVffFb7LRdAUM1ZRt0ZzY79Q0O3cGhHBDOUu4VdpA/lQ/bgWSvbjXbiLNbJL8X5j0 rBIpBrffEMOhno3i5Ne/fTxtrxOMjxmtXmS1rMHUx/xgZBsSA7cieJcxWHYMeg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624036931; a=rsa-sha256; cv=none; b=c9meZLeTFyG8fIAM78F4eJZzuC3TRD4xMuMn6uWnKu06hhxVlaeYyh7LsNsZb4RMo0FaHd Wd5H9WQF5HhzeTf71Lwt80iEeaveDNMBZUjiJV0/KJbDPU7tr9Ysund8qozx4Mpi024ngK 6Dh0AeVEOoQs+1f5z5JmYEEzJrYOJVQsm186FC/+PDV3+LbuPQpufVtKqXKNGez+gTF1Je IZ2w6iZULxyS9F+/5ZUCtt57tsrNezOzArnmjPq0G/nVINibeeR+DNNRXDCvXTZSXB7Ibs koxa0vEJLaTvtR7s9DeAImwalBCLPFe1vqAcINX2FknEcPXsB+ZoALi/R0JnCA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=gFaBHPq3; 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: 5.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=gFaBHPq3; 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: 929EC12154 X-Spam-Score: 5.17 X-Migadu-Scanner: scn1.migadu.com X-TUID: XRRhJVRaI8NA When cross-compiling a package using gnu-build-system, %build-inputs does not exist. But libgcrypt uses %build-inputs anyway. Fix it. * gnu/packages/gnupg.scm (libgcrypt)[arguments]<#:configure-flags>: Make this a G-exp instead of a raw S-exp. Eliminate %build-inputs and use this-package-input instead. --- gnu/packages/gnupg.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 1fee30584c..35cfdf6f43 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -74,6 +74,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) @@ -169,11 +170,12 @@ Daemon and possibly more in the future.") ;; 'configure' uses 'gpg-error-config' to determine the '-L' flag, and ;; the 'gpg-error-config' it runs is the native one---i.e., the wrong one. `(#:configure-flags - (list (string-append "--with-gpg-error-prefix=" - (assoc-ref %build-inputs "libgpg-error-host")) - ;; When cross-compiling, _gcry_mpih_lshift etc are undefined - ,@(if (%current-target-system) '("--disable-asm") - '())))) + ,#~(list (string-append "--with-gpg-error-prefix=" + #$(this-package-input "libgpg-error-host")) + ;; When cross-compiling, _gcry_mpih_lshift etc are undefined + #$@(if (%current-target-system) + #~("--disable-asm") + #~())))) (outputs '("out" "debug")) (home-page "https://gnupg.org/") (synopsis "Cryptographic function library") -- 2.32.0