From patchwork Mon Sep 2 15:32:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15221 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 EE6941734D; Mon, 2 Sep 2019 16:34:31 +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,URIBL_BLOCKED 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 9D76417329 for ; Mon, 2 Sep 2019 16:34:31 +0100 (BST) Received: from localhost ([::1]:37550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLe-0001N8-NL for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:34:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41934) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLF-0001Kk-Vs for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oLE-0002Ya-KK for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49896) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oLE-0002YU-Hk for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oLE-0006Qx-BB for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 01/48] gnu: libgpg-error: Fix cross compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:34:04 +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 Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.156743843124578 (code B ref 36477); Mon, 02 Sep 2019 15:34:04 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:33:51 +0000 Received: from localhost ([127.0.0.1]:58685 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oL0-0006OG-Hn for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:33:50 -0400 Received: from mail-wm1-f43.google.com ([209.85.128.43]:37388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oKz-0006Nr-6L for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:33:49 -0400 Received: by mail-wm1-f43.google.com with SMTP id d16so15056394wme.2 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:33:49 -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=fbjhgLiIcSFl1jnVMgZJ0ZGtXkc4IJDs6xJwIiAuOxg=; b=rsjGgZoiRue05VDXz1fsHkOm9rFBFw1hO2w9PtesM9WXNec5AFPcHv4GcdDvAXTkdk q/O25/biwZ4TS67r/QjXqKlnWsSFeFapRuamPo1Zgb1dqO4xTZBgNWR5/tItlMQ8bU6h 9RwfyZ5cmF9cuTAUMuPSkKrbR15Vu/7Hdctd7PPx/k0KXSrHQsVp7RBT7bW2mLUmp9Rw baQiFnkVCq0CMS0netAfH7w+X8eB7HA06GY9e1k+cGYMuMh7blwiu4cysgVX9dlWrSaN LLvPRU49PU/WuSJTKu6v9yBqg/MnzRebdQ/4ACTp+rXD9XS0G66Ehxi8ZSeG8CAg+3gM 550Q== 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=fbjhgLiIcSFl1jnVMgZJ0ZGtXkc4IJDs6xJwIiAuOxg=; b=CQu31/R4czrGTWkaN7/MAI6eYIyrk7ZNjzLvi5un5c/aIPt3mj0eu9VFoVEJ7kQqoo AZ1r34gxz80BdcSSYePTsDm4SY8+lJVhT4lE3MhCxIKGEVTXFXc0DUm0/fkoeN87bfzy y0X+c8HkSexwqHOBgyBC9yYedT7GGupBR4mjVqdizzbyIrpVHmKEmFaTdz518ZH9fCnL KDfwhc0jqx5N+9NisQ7VMJNxHlNp5O1oWyVgca3NR2DKzqQGWM68nbhVr7fVcpogN/Uh vMHw8C36nXFE2Hek1mwb65wBTMNvVdqKRvlY10Jc4oBKdbP9b76dTpetsrHpT7DCslVp ilpw== X-Gm-Message-State: APjAAAVJ2sP2E6Vd+ad9iytLyuc6QbuFjbvUXgz5sZKLNRPGCTZXDVht 7rFbmcgoUld254OxXWWD9WAIIwNr X-Google-Smtp-Source: APXvYqwukO5sp4YVRvbmY+a7rXNBW2+ucCcr93dgjkYwjl9kufDpco8V8TJGx13f9oYSh1eUpwrlzg== X-Received: by 2002:a7b:cb0a:: with SMTP id u10mr9676026wmj.16.1567438423273; Mon, 02 Sep 2019 08:33:43 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.33.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:33:42 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:32:46 +0200 Message-Id: <20190902153333.11190-2-m.othacehe@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190902153333.11190-1-m.othacehe@gmail.com> References: <20190902153333.11190-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: , Cc: Mathieu Othacehe Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnupg.scm (libgpg-error)[arguments]: Add a lock-obj header to the target platform when cross-compiling, [native-inputs]: add gettext that is needed when cross-compiling. --- gnu/packages/gnupg.scm | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 95a35368fa..c7e6aabf79 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2017 Petter ;;; 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. ;;; @@ -96,6 +96,31 @@ (("namespace=errnos") "pkg_namespace=errnos")) #t)))) (build-system gnu-build-system) + (arguments + (if (%current-target-system) + `(#:modules ((ice-9 match) + (guix build gnu-build-system) + (guix build utils)) + #:phases + (modify-phases %standard-phases + ;; When cross-compiling, some platform specific properties cannot + ;; be detected. Create a symlink to the appropriate platform + ;; file. See Cross-Compiling section at: + ;; https://github.com/gpg/libgpg-error/blob/master/README + (add-after 'unpack 'cross-symlinks + (lambda* (#:key target inputs #:allow-other-keys) + (let ((triplet + (match (string-take target + (string-index target #\-)) + ("armhf" "arm-unknown-linux-gnueabi") + (x + (string-append x "-unknown-linux-gnu"))))) + (symlink + (string-append "lock-obj-pub." triplet ".h") + "src/syscfg/lock-obj-pub.linux-gnu.h")) + #t)))) + '())) + (native-inputs `(("gettext" ,gettext-minimal))) (home-page "https://gnupg.org") (synopsis "Library of error values for GnuPG components") (description