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 OOgsF0IIzmA4EQEAgWs5BA (envelope-from ) for ; Sat, 19 Jun 2021 17:07:46 +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 eDXqEkIIzmB0eAAA1q6Kng (envelope-from ) for ; Sat, 19 Jun 2021 15:07:46 +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 C625C21EB8 for ; Sat, 19 Jun 2021 17:07:45 +0200 (CEST) Received: from localhost ([::1]:53706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucZU-0001so-Ra for larch@yhetil.org; Sat, 19 Jun 2021 11:07:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56596) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXw-0007tq-Dl for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48878) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXw-0007tv-5K for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXw-0005f1-1G for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 12/36] libgcrypt: Fix cross-compilation build error. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06:07 +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.162411512521461 (code B ref 49025); Sat, 19 Jun 2021 15:06:07 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:25 +0000 Received: from localhost ([127.0.0.1]:60368 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXE-0005Zz-9T for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:24 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX3-0005VK-Cn for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:13 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135DpA; Sat, 19 Jun 2021 17:05:13 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:34 +0200 Message-Id: <20210619150458.12057-13-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-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=1624115113; bh=iyB61VxSz7o0o0YVn5/Hy/tABDE+f8iFAuqZZNSIiJo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XqbG/HEtUGHjxmQ0QvLP4B4JxprTr+3WU/cz6JpC1gJRnzdtQLi5DO/yL/CGCtq0I o2pvVPDjIOuRBb+GjUICIJIwEIxlVObgK6oZrv95ZfQsylH2etZ+6C0P+FAoZyvaea pb/2npNRuFPDuZFbLBMaPw0tmc3y6ENseNSdJmPA+M4WupGa246r/7Wxn3cwYZ0kbr F5cutwjlYfcsiQy9lMclB0hXcTfhgcU3rgCN+WSgiYKFZvEJPXbIEHaHbm7wlQNydT NI8QqhEl1WYdjmyw5HqYV63mQEOWfarwmBls/wk477U2Ba8O+vY60mbTYvSzwcP57Y HWSfGNOaU/VrQ== 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=1624115265; h=from:from:sender:sender: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=SS6NAlk7CgPn4pQ4kcEMjAr399YbiPmLzRt1JEWOJrHR4y3G7lJP4wm/2DZpwgnG0Tkpsf sw95IPi+IYZ+n5G5J63TA1GTcOCUoFHP+ybgVoqMthhfBcgTWVa2l+b1P07JhfDRCz3ePu 4zx692gxGjfW7ijuZ7lfW3zSaLxC5LIHsaCi7xyeSFH1858dII+X8Vxiyyjg3bzkNWnkJD MjN/OO68v9OLYHWZUzykcTzLRVZCKz/jrUl6butM0CfEMj2+Xq6HDLaj/nimyIqIsT/I/o 3dAB0iMFRPl6/1pts9DO5r5apTWuzb0PsI1+RSH/VsuNootXvKfYA5DKVcxZgQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624115265; a=rsa-sha256; cv=none; b=dc+COSeyGkRaY6ADodrwgaGWQMlzLDGc4ZslESqe9bUYlWVijHAwcl/HnH3etJy6NFFxJz 1J+ZZVi0KJr4f20PhWdb5ghKQ8M+1fFN5vQ38MBFGBHkXmHGXnGoQHsHowKOCwjDujXeMi QxUIH1UYwEzWFunt8atMitZUbp+E5eYMlbvfQbvyLk5pT1FYB7+3iEULMTNloOtO/rLFrQ 5ueRwBAqNS08K/RIl5ZVzkiFqE8a4CiftPTSLjySAKqTFM5Ftubx2A06hOsIO0MA7+zXrM ZYmmQFVjGRJyxyJIXZeHV9Iew9G3cnSEcCs2259v0kX9WwbHRrLvMNG474hwdQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b="XqbG/HEt"; 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: 3.68 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b="XqbG/HEt"; 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: C625C21EB8 X-Spam-Score: 3.68 X-Migadu-Scanner: scn1.migadu.com X-TUID: OAZEMJN5tizG 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