From patchwork Mon Jul 8 09:58:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 14510 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 2A5EA171D4; Mon, 8 Jul 2019 11:00:25 +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 D4A74171D2 for ; Mon, 8 Jul 2019 11:00:24 +0100 (BST) Received: from localhost ([::1]:39998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQRc-0005OB-Fc for patchwork@mira.cbaines.net; Mon, 08 Jul 2019 06:00:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54772) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQRQ-00058h-5G for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkQRO-00034F-PB for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49040) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkQRO-00033t-HS for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkQRO-0004tN-ET for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH 07/31] gnu: libgpg-error: Fix cross compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jul 2019 10:00:10 +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.156257998018420 (code B ref 36477); Mon, 08 Jul 2019 10:00:10 +0000 Received: (at 36477) by debbugs.gnu.org; 8 Jul 2019 09:59:40 +0000 Received: from localhost ([127.0.0.1]:57795 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQQt-0004mq-Ra for submit@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:40 -0400 Received: from mail-wm1-f45.google.com ([209.85.128.45]:52003) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQQq-0004ky-Cc for 36477@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:36 -0400 Received: by mail-wm1-f45.google.com with SMTP id 207so15096071wma.1 for <36477@debbugs.gnu.org>; Mon, 08 Jul 2019 02:59:36 -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=B0mDDnOBIQ0gt63IxYXEkuq2ssLtCCkYukfDONo6mSI=; b=MLQSoIa2YWwhLPpG4uFAF5sgNMZhAgdJZj8qXPmS6nStCV0kcux3dg7JsE8LgK29Cz yrzFiR8Je7pL49GEWY16eCbFQX0SJD31JbzInDni98k6ZjkOsnLNY+aCZ3xBoh1lVN1d 61OiJM65hdxnwI3FeaNVdHOYglJgfHrsFo5CofEnbCHc1AbEviMUUdFvpdmmJq2GA/kh Vouy+iv4DRc6oln3lwQKiMc3/6YXYsf9vDvVnIV579aDQRoJdv0SxJFlA5dqbRZeBBXk 9kttj8Yy9LNxsLPa0bhPqytWJc428u4K8AhDbDmF2a2VmnjRTUrAkU6YCE95crOvDovX WvPg== 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=B0mDDnOBIQ0gt63IxYXEkuq2ssLtCCkYukfDONo6mSI=; b=H7o0TAoA/p8tl3OFFuWGXgyTHLAaE2tnIuVu7kTVXkQ+hym5PX5sk04vDymVf2DVKj f3gvIvOYS12RllY7G11M9znBpDFAtRCRRcL1zmlH/fOUemUhqipo/bzi9Afaw3wbU65p niGTcueJT8hAOaLckKPP62hACd1ry4izZrfpHoNLklKhsPFBlHbjNKhqxoLsPHGl+rur PioQhQqmcWV0UgF+zO8FuHS+kighHniB93nZVmrvE5cptStZNJXTd8LPZQ21xuIPWpht wsv9QRTM4C9h5YAGJQ/atDhLsWvciXPc4MsHCPiz9VwO4KHzRepZi8CNfnDTNbTAMjHc fnrg== X-Gm-Message-State: APjAAAXLlcPiSGZdgSgjbAjASCnsJKswgLl8DZ0RzuCzYxMpbP/uVAgb PRlSC8EaECkMbtD7v1TrN/5b+JCl X-Google-Smtp-Source: APXvYqx5v3YvjWWbvtKL/0MPiPTxhXE1UqHLL9Sx5tpzhmRSYCm+Pi+JElKcoz/x4Yka302ENhfusw== X-Received: by 2002:a1c:a8d7:: with SMTP id r206mr12212523wme.47.1562579970338; Mon, 08 Jul 2019 02:59:30 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id i66sm3165127wmi.11.2019.07.08.02.59.29 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 08 Jul 2019 02:59:29 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 8 Jul 2019 11:58:49 +0200 Message-Id: <20190708095913.3460-8-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190708095913.3460-1-m.othacehe@gmail.com> References: <20190708095913.3460-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 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index f84f8d73a0..68e8270206 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2017 Petter ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -86,6 +87,27 @@ (base32 "1jj08ns4sh1hmafqp1giskvdicdz18la516va26jycy27kkwaif3")))) (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 + (add-after 'unpack 'cross-symlinks + (lambda* (#:key inputs #:allow-other-keys) + (let* ((target ,(%current-target-system)) + (tuple + (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." tuple ".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