From patchwork Wed Oct 2 09:58:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15572 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 547551749F; Wed, 2 Oct 2019 11:02:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 1060B1749D for ; Wed, 2 Oct 2019 11:02:13 +0100 (BST) Received: from localhost ([::1]:53172 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbSU-0005CQ-Nf for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:02:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51141) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQd-0003oM-AC for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQb-0000Ad-Qs for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54923) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQb-0000AS-MN for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQb-0000aP-JA for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 13/23] gnu: guile-gcrypt: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36477 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 36477@debbugs.gnu.org Cc: Mathieu Othacehe Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700103871914 (code B ref 36477); Wed, 02 Oct 2019 10:00:13 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 09:59:47 +0000 Received: from localhost ([127.0.0.1]:35470 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQB-0000Uk-1W for submit@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:47 -0400 Received: from mail-wm1-f49.google.com ([209.85.128.49]:54169) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQ7-0000TP-Ls for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:44 -0400 Received: by mail-wm1-f49.google.com with SMTP id i16so6486021wmd.3 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CovSUVE41W6pB7EhrSzsWrDAGHgc8VxWxwN42Sriczc=; b=rgGTMSXSDmbIUDunwmyp2gT/5R+RXsJFGBJ7Tc6GBgPG1tj1fgu+N+iHWLY+wyl2jt 5k0JTS0qVSgq8DRiIoCCxehvvFZC59G/41NXx5I5yEBOaadLELqTIl1BFH2urigUSrAQ Z14uhq1LtD9tYttoRH4tctucE/2AQ3qQm0AUHEslgOMD6jwFUsmRtAl/fG7qwmFFMOXX GGLH9vYfIXOT/Pz1mvblHDvnGIHzrMfiThHOTM/I9p/7lHDdvFWSyfAP5oAKFa3JoOjA 7naZ28W/ikgOdqAMdguiyf0AAwKLhbQh/1nsI7DRb75e4zeVXcqwFjRWnlPEa99UfekR Kp0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CovSUVE41W6pB7EhrSzsWrDAGHgc8VxWxwN42Sriczc=; b=iCe9r12oM1C1pczXniYJxc8rw83tT3n+rAZCCylMrNrZIhCL/SrKqj9O/ubyZylBBl Fi8DvwdPw6ZcQ7zF7rYL6gThgSW8vE/OqvI2ZIgfl/ENHzyj4gpKXOeBvFqHCgVjCdO6 NjG6eWPTyT7Ah8pVbZQkFlwD0OdkMeaEMactD0LRDtorL/dTXnZWlbPbg5S7GnCAwC+f SfrbR9FqiHOhD1B7kfkaa7riPvBE8CFZ8doCxpWyoxtOC3E7gWK3v252LcKllbyI051Z at9+40AIc3S6Ls3vAEmFg0VgngiOrVTPQqF2lalydnSHxyZOilJanTM++NWfPo8cuABs 4F4A== X-Gm-Message-State: APjAAAUgCEZqtSNK7tAf9yVr75MSBCLFMm1cZ9xlQj3u6/pcdhnEUG35 +PVqTQhyKOTZQnhJ5g/yW6I9oHbn X-Google-Smtp-Source: APXvYqyVfqMivvHyt5jXvZdXJVXplqgAQ38ZRdWFvHFayesFA1SxwniNlqb1H5IMV6GFwvsz2OXTtw== X-Received: by 2002:a1c:5f0b:: with SMTP id t11mr2210528wmb.76.1570010377612; Wed, 02 Oct 2019 02:59:37 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:34 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:58:54 +0200 Message-Id: <20191002095904.6325-14-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-1-m.othacehe@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnupg.scm (guile-gcrypt) [native-inputs]: Add guile, [arguments]: add libgcrypt-config to PATH when cross-compiling. --- gnu/packages/gnupg.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 4acc434093..9ec51d8201 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2018 Björn Höfling +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -479,11 +480,26 @@ gpgpme starting with version 1.7.") "1mhc5m4xygkfj7x18f8apiqpfdn9mrql0am5sk13cf5xn8x1r63z")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) + (arguments + ;; When cross-compiling, the bash script libgcrypt-config provided by + ;; libgcrypt must be accessible during configure phase. + `(,@(if (%current-target-system) + '(#:phases + (modify-phases %standard-phases + (add-before 'configure 'add-libgrypt-config + (lambda _ + (setenv "PATH" (string-append + (assoc-ref %build-inputs "libgcrypt") + "/bin:" + (getenv "PATH"))) + #t)))) + '()))) (native-inputs `(("pkg-config" ,pkg-config) ("autoconf" ,autoconf) ("automake" ,automake) - ("texinfo" ,texinfo))) + ("texinfo" ,texinfo) + ("guile" ,guile-2.2))) (inputs `(("guile" ,guile-2.2) ("libgcrypt" ,libgcrypt)))