From patchwork Fri Jun 18 16:09:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30405 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 839CD27BC81; Fri, 18 Jun 2021 17:17:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 527CF27BC78 for ; Fri, 18 Jun 2021 17:17:20 +0100 (BST) Received: from localhost ([::1]:55346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luHBH-0004Jv-9d for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 12:17:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luH5G-0000IA-5O for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46290) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luH5F-00026y-MM for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luH5F-0002yP-I2 for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [[PATCH v2 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 16:11:05 +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.162403264211168 (code B ref 49025); Fri, 18 Jun 2021 16:11:05 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 16:10:42 +0000 Received: from localhost ([127.0.0.1]:57779 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4r-0002u0-PP for submit@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:42 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:49754) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4U-0002q5-0y for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:18 -0400 Received: from localhost.localdomain ([188.188.242.184]) by baptiste.telenet-ops.be with bizsmtp id Jg9t250053zRM2s01gAHN3; Fri, 18 Jun 2021 18:10:17 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 18:09:11 +0200 Message-Id: <20210618160936.18972-12-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618160936.18972-1-maximedevos@telenet.be> References: <20210618160936.18972-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624032617; bh=iyB61VxSz7o0o0YVn5/Hy/tABDE+f8iFAuqZZNSIiJo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=auJhlPrDaF97lr3n3tYWuST0K5d6L3nIq4yPWE77pB8iYTlD226n5TuOslJhFh9/b Zn+10b6+XDy4/gdGi/jG7TLvVvLnWK/F6Ps6qeJKcj+PZPY/Q4CMT5ZD89AojsCZUr BDdUOQBUOKn1NA2S8ZX5ENbNUytEXH6g1i2TMQFlVj0ftuyiNppKzVWa91oySd92Of NUnZYMbR9SRBc2Gc3aVnIe40afbUZcKxrtxjCa9ReZhDUbEhHRCaP1/jCLwm4k82hA dxL5B31M+rnogTr5Q4+tovJs0eD+QqcU4EG74px2fDdDSGy+Nm5oxeBXEjc295EMDq hEU19dLZP2Hyg== 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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")