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 cCQTAlN8x2BTbAAAgWs5BA (envelope-from ) for ; Mon, 14 Jun 2021 17:57:07 +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 aGCfOFJ8x2AKJwAAB5/wlQ (envelope-from ) for ; Mon, 14 Jun 2021 15:57:06 +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 AB1358103 for ; Mon, 14 Jun 2021 17:57:06 +0200 (CEST) Received: from localhost ([::1]:55806 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsoxV-0001Yz-Nj for larch@yhetil.org; Mon, 14 Jun 2021 11:57:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54450) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsof6-0008Q5-OZ for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36005) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsof6-00078n-EL for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsof6-0004EH-Ch for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH 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: Mon, 14 Jun 2021 15:38:04 +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 Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368505816105 (code B ref 49025); Mon, 14 Jun 2021 15:38:04 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:37:38 +0000 Received: from localhost ([127.0.0.1]:47519 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoef-0004Bg-KH for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:37 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:45738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoed-00049r-8H for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:35 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3da2500K0mfAB4013daQW; Mon, 14 Jun 2021 17:37:34 +0200 Message-ID: <97624d382b54763e0753a1e9526be77c521907c4.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:37:34 +0200 In-Reply-To: References: Content-Type: multipart/mixed; boundary="=-tmE5pNVtBTNjjBUHUTMV" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685054; bh=nv31MQlIII2/PGkn8qfb8Jqa7C1agUnjicNAqERTAM0=; h=Subject:From:To:Date:In-Reply-To:References; b=ZepTO7DxgtDn44xt0tJ4J/V5E1s50U/law24EbFUsI0qwLdrCv9wkvQXbGnTjM30i TB0fSLNNlqD5umnMpbQimuCDw7MTzEQxlUJElBCSO/CRFLvaIEwW/52szQWBS1k2Ky n4IIhiEjfMf6txVEt/Owua5T8H9FYMcIuY12g+amEFEg/wnCpU42pj9xlTJyBNRbJU 010EHinJFSbk80XzaxMaYSrG0vA8tesX2E69EmrWFTmsPHCbZ71198/8grZBRlSrzx uZDcyg9wMxZOo8QnO1eqD3NZMOJMT58uS/vidjvRraEKZpymEvomXuvbrdvY3GOQie SgpDJZG47JVcg== 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=1623686226; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: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=nv31MQlIII2/PGkn8qfb8Jqa7C1agUnjicNAqERTAM0=; b=ffR+CoR2YagJhlUAPESOQPHPuYsLuHd6W7g93xAYnzNFWa1QjR5qdBAXNGxxFe3WvSXVKB Ar6ZCkT+Eh4rleZC/nZNxRi0u0T/t05dQJMaOaD4f3HqZoZ6IuFwPWtRQGd3pj4WlUDR/E yZUPiIG25nJLLLAVsfzd5hN5IuVkujpb5VEC7HRr5dDwwydAL3kxB7hbie3dbC6lUFxdnm f1py9snPzMqzIgV5tFBSxE6SycjyMBQflj6UOYo8/CjVPoMTRt3rvtm2mryq13UsS8rFL2 mmTpfvGeBZHzouN8h9nWLFQEeRbHCBGubWIu2gMr8S2V1FS3MnkOz/q5ekO30w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1623686226; a=rsa-sha256; cv=none; b=hr47xmULMjDJWWzCKKztc7nZ727B6wDVIRdO36CvgIrpIYAzHMJXVZLcqH5vOP0Z9BZc3N weMyYE0Ne6WodMTnEm0EBlbhuEEWFP7RuhJj3iUzzIdTF+7K/SKlIMkxEjTTVB94ct/Szl hH8jNZfsa2um2htJ3wkpa/tEKJ6B6WL93a5Pkbu0JNZRts1iQYLRaVfvYbmpf4OSJbDfkd uVyMsYsCo2VOqpGQYL0Qcre1U4r0fNYhzDbNogP8dXXQZzQdfoxITSDrLPfAZ0VQNjpHTi jaDVsOw1JGscBI2fqs6UCNDYbnpvxjonC8LnGypZxoZWJK7/JlKPaHNY2aNFbA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=ZepTO7Dx; 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: -1.33 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=ZepTO7Dx; 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: AB1358103 X-Spam-Score: -1.33 X-Migadu-Scanner: scn0.migadu.com X-TUID: s2pmGAYiaKjZ --=-tmE5pNVtBTNjjBUHUTMV Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit 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(-) --=-tmE5pNVtBTNjjBUHUTMV Content-Disposition: attachment; filename="0012-libgcrypt-Fix-cross-compilation-build-error.patch" Content-Transfer-Encoding: 7bit Content-Type: text/x-patch; name="0012-libgcrypt-Fix-cross-compilation-build-error.patch"; charset="us-ascii" 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") --=-tmE5pNVtBTNjjBUHUTMV--