From patchwork Mon Sep 2 15:33:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15237 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 EDCAE1734D; Mon, 2 Sep 2019 16:36:23 +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 AD61A17329 for ; Mon, 2 Sep 2019 16:36:23 +0100 (BST) Received: from localhost ([::1]:37612 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oNS-0003FK-V5 for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:36:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42687) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMJ-0002IR-Aa for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMH-0004UO-07 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50034) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMG-0004T3-OM for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMG-0006de-KL for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 29/48] gnu: texinfo-4: Fix cross compilation Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:08 +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.156743847425194 (code B ref 36477); Mon, 02 Sep 2019 15:35:08 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:34 +0000 Received: from localhost ([127.0.0.1]:58792 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLh-0006Y5-Pj for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:34 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:51474) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLS-0006Tn-9P for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:19 -0400 Received: by mail-wm1-f65.google.com with SMTP id k1so15053906wmi.1 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:18 -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=D5OnrboWQ1nkSf8HkR5A2ChVg84h8Cq2BRx6QZNx8RU=; b=haceCxKwXF6xtHbM7oz9BvTa9PAna8xjqavpQR6n0gEyVIlJhld1SBX86vUUniMTzW SKuoU1s2TNatW1bpk0RVV/F/RV9HZ9qsU2O0NBkjhCHrzidq/mRRDLPX11glYVd8SlXu TOBHmUV1Wx4FM+xdtaCaMuaLB3F1mAmTyQ+/am9DVFHxwgNCDwgEbc/ncracfDAlKgt3 nAc2rcCzszzYDbrjjSsl4r9iRX8oXpqf3An47w8+qdUARdxEsxmDH+joHWNQDylBBWYK nUemTc8B2Wz++yHlnwUfuAx/80jpe7HTUnVzHBTPGK2DpKpAwXqRW9mEPHkttP4ht5uK 0hqw== 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=D5OnrboWQ1nkSf8HkR5A2ChVg84h8Cq2BRx6QZNx8RU=; b=MqmuVsrWvYBGce5YmVg5ldxNR7vplyOXAQMyIXRys3ROKlyolhJkILHcL9bljPW4X4 uO0zEMLGmQMR4/QFLD/41GRQLm98pQg/PQOG5EhJ73K/c4393cy1giAeyncuE0LJbVkN ZKOaYt7q70zStP+fFJFxHayv2KIUz+hIpMbrKGXElWD3tm0Wu6NLSXDSMPVNMyzWNEZq r8+9js5IEo80KvechyJSE1bv7FwHtB44FxFyC2bgmV5Iw8uJBaIXjRinDtRTFagGXbnt ZVXLtNcsNi56W4qBoNuO3rHm05QyUOF6594+ehelIuo7zPxfmCYJ4TGs3abN3FqabrzH e3Sw== X-Gm-Message-State: APjAAAWa/+iex0792hVLxiDNcm4kfvTvmgBZYo7Tdw1lmVRSOoSPqQeb mbfK51qUpHEAT10ygAv6OkYSggMa X-Google-Smtp-Source: APXvYqz1FoIRCXhPtz1gJxn03x/nsvy8oIGlejnJfYfd0X1o0a2GgLNWd+QFmzFSabPBasrNJ5yALw== X-Received: by 2002:a7b:cf0a:: with SMTP id l10mr5052761wmg.4.1567438452595; Mon, 02 Sep 2019 08:34:12 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:12 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:14 +0200 Message-Id: <20190902153333.11190-30-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: Pierre-Moana Levesque Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Pierre-Moana Levesque * gnu/packages/texinfo.scm (texinfo-4)[native-inputs]: Add automake and native-inputs from texinfo package, [arguments]: Replace outdated config.sub and config.guess by the ones taken from automake above. Also make sure native tools are built before build phase. --- gnu/packages/texinfo.scm | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 19f87a4de9..fde1a12a91 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -21,9 +21,11 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages texinfo) + #:use-module (gnu packages autotools) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages compression) @@ -106,8 +108,37 @@ is on expressing the content semantically, avoiding physical markup commands.") (sha256 (base32 "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d")))) - (native-inputs '()) - (inputs `(("ncurses" ,ncurses) ("xz" ,xz))))) + (inputs `(("ncurses" ,ncurses) + ("xz" ,xz))) + (native-inputs + `(("automake" ,automake) + ,@(package-native-inputs texinfo))) + (arguments + (substitute-keyword-arguments (package-arguments texinfo) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'fix-configure + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.sub and config.guess. + (with-directory-excursion "build-aux" + (for-each + (lambda (file) + (install-file (string-append + (assoc-ref + (or native-inputs inputs) "automake") + "/share/automake-" + ,(version-major+minor + (package-version automake)) + "/" file) ".")) + '("config.sub" "config.guess"))) + #t)) + ;; Build native version of tools before running 'build phase. + ,@(if (%current-target-system) + `((add-before 'build 'make-native-gnu-lib + (lambda* (#:key inputs #:allow-other-keys) + (invoke "make" "-C" "tools/gnulib/lib") + #t))) + '()))))))) (define-public info-reader ;; The idea of this package is to have the standalone Info reader without