From patchwork Mon Jan 8 14:56:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 58672 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 D626827BBEA; Mon, 8 Jan 2024 14:57:43 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 010FC27BBE2 for ; Mon, 8 Jan 2024 14:57:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMr3l-0003QM-Jf; Mon, 08 Jan 2024 09:57:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMr3i-0003Ps-AS for guix-patches@gnu.org; Mon, 08 Jan 2024 09:56:59 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rMr3i-0001Oa-1z for guix-patches@gnu.org; Mon, 08 Jan 2024 09:56:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMr3m-0005cC-7p for guix-patches@gnu.org; Mon, 08 Jan 2024 09:57:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68323] [PATCH] gnu: gnupg: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 14:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68323 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68323@debbugs.gnu.org Cc: Mathieu Othacehe , efraim@flashner.co.il X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170472580821574 (code B ref -1); Mon, 08 Jan 2024 14:57:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Jan 2024 14:56:48 +0000 Received: from localhost ([127.0.0.1]:37254 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMr3X-0005bu-U3 for submit@debbugs.gnu.org; Mon, 08 Jan 2024 09:56:48 -0500 Received: from lists.gnu.org ([2001:470:142::17]:42234) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMr3T-0005bn-WC for submit@debbugs.gnu.org; Mon, 08 Jan 2024 09:56:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMr3I-0003OG-4C for guix-patches@gnu.org; Mon, 08 Jan 2024 09:56:32 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMr3G-0001G1-Tv; Mon, 08 Jan 2024 09:56:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=DBOytvuAIEqpwlI4bBXBMiU5GiLX8v4TZ07+GX5WxWU=; b=Pno9DdGF55GjtL 3/qCAe9M+pB3lAqhx11FgWFhuuUScz2OGP1IC1aCYec1fYJOYCP2bpr1DMHAwXCcFrh6w3rAmC8l6 wGQLWBv34+RR4hSVXNSruucVGRtKhuXzSTRrD2ijH/H8fNLMJTaM8NsUaAlbuzsj/0fHnzK6omvgw oLxYl42g+nhzbbclmQBh1ZrKSQkb+znorFcmJ3y/BeEge5HZUh+VMjgOy6smziWHZdi3Ke/VslnuE 05AqK5jfUpjbCbi9xTZazVMRZ2d7UqlB0Chmq90xljflvkswVHdE+SJdudRjab2zbmXVjmU9UbMze ZtLGuOnS1r6RDpN8y2hA==; From: Mathieu Othacehe Date: Mon, 8 Jan 2024 15:56:14 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnupg.scm (gnupg)[arguments]: Pass libraries prefixes when cross-crompiling. Change-Id: I461ba02ddf5bb23277bd6685c2106e4ad37e2184 Signed-off-by: Mathieu Othacehe --- gnu/packages/gnupg.scm | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) base-commit: 9018c6af4907c4532a95017df9f45d9439c30064 diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index a6ba57d7f3..a67eb5c691 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -345,11 +345,33 @@ (define-public gnupg zlib)) (arguments (list - #:configure-flags #~'(;; Otherwise, the test suite looks for the `gpg` - ;; executable in its installation directory in - ;; /gnu/store before it has been installed. - "--enable-gnupg-builddir-envvar" - "--enable-all-tests") + #:configure-flags + ;; Always use quasiquote on the next core-updates cycle. + #~(#$(if (%current-target-system) + #~quasiquote + #~quote) + (#$@(if (%current-target-system) + #~(,(string-append + "--with-libgpg-error-prefix=" + #$(this-package-input "libgpg-error")) + ,(string-append + "--with-libgcrypt-prefix=" + #$(this-package-input "libgcrypt")) + ,(string-append + "--with-libassuan-prefix=" + #$(this-package-input "libassuan")) + ,(string-append + "--with-ksba-prefix=" + #$(this-package-input "libksba")) + ,(string-append + "--with-npth-prefix=" + #$(this-package-input "npth"))) + #~()) + ;; Otherwise, the test suite looks for the `gpg` + ;; executable in its installation directory in + ;; /gnu/store before it has been installed. + "--enable-gnupg-builddir-envvar" + "--enable-all-tests")) #:phases #~(modify-phases %standard-phases (add-before 'configure 'patch-paths