From patchwork Wed Aug 21 08:54:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15069 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 6505B17264; Wed, 21 Aug 2019 09:58:16 +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 13BF11724B for ; Wed, 21 Aug 2019 09:58:16 +0100 (BST) Received: from localhost ([::1]:45624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MRb-0000pn-3W for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:58:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58544) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPW-0006V3-NP for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPV-0005Dg-DO for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54068) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPV-0005DV-8c for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPV-0006Xm-5t for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 07/61] gnu: libgpg-error: Fix cross compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56:05 +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.156637772424682 (code B ref 36477); Wed, 21 Aug 2019 08:56:05 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:24 +0000 Received: from localhost ([127.0.0.1]:34570 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOq-0006Q0-63 for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:24 -0400 Received: from mail-wr1-f46.google.com ([209.85.221.46]:43115) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOd-0006Mw-JV for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:12 -0400 Received: by mail-wr1-f46.google.com with SMTP id y8so1218162wrn.10 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:11 -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=Yu+mVm4DlZTdhtvw7aRa+x+FiWIj32zn2Tujke55UQ4=; b=MbuSQQhGcgniHkqpDHLKVRB2XdPNUByhdte6R5lbjaIXtzkv4arwzEfws9t9y4lVhu HQ8Lf9RhletR8s5VkgBo8NlUG7XhEdnQ56rbGJYraja4qXN6KI3AwTuhAB4GC7AqTfmS DLfcm9lFMeX8pTxYRdNbDOujyXJg+klgHIQKWvSFp0DquQhLY3VDtVGO61aM0BU+6/1b 9k07MdCnijMaIB3IBFVzM0aL43IfFbDfZ56JG2+eWqNDHMeXHcEzkFrvDWy1GZaKAi0k HJLDWrslRzSyvxP/ACOoR9Obf4RFTqvtzCtNfVX6r8iM70TgaxgmbO55NFXpByf8y+DF qRMw== 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=Yu+mVm4DlZTdhtvw7aRa+x+FiWIj32zn2Tujke55UQ4=; b=C57uAkmcfV0IQE53GLTyxR7iqelIjcn6n0zd4RuK079gHcO8IHMVCBW8ujpVLLfddY MFFH8M5zf5JkARNGTcNz96A4euDbuH0GdMvrMTrZYL2FFWv5GOEn16tMimk5j8nj6ET2 0nHy908ZFtqsnW/NL0lL1tknA1KAmC+B8NSHJ7HnaHEywcbcIUROAOhQKbwzrerxnUXX 0nW6xX535DP7OJgaREAT3ZmbxSPnthwVRF15boIh8jSWsOjNtejAaGgpyyKD0Gb4qyJH DXH5t0cqRhbNYsVkxYJYM5pr1lNrDc0KUWcrVW9dtMUopdPZ5HQGQZOxkucB/HZW20Su fP1Q== X-Gm-Message-State: APjAAAUlnBfW4t2TKZWyYkk2B+iveU1hRdQDt90tiC34rJMMOpTKusXm b3UBadHshlUGQfO+/kTcJlOu+fu0YMM= X-Google-Smtp-Source: APXvYqx8+jNB/OcGr7ey2zSur++yjV7Y+TkCEuG8FPxwejiSUYCNohEgDZ2g2VkGClBxveTj2TM8uw== X-Received: by 2002:a5d:6a45:: with SMTP id t5mr10133292wrw.228.1566377705623; Wed, 21 Aug 2019 01:55:05 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:05 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:01 +0200 Message-Id: <20190821085455.18508-7-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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