From patchwork Thu Jan 3 16:50:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 649 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 BA5CF16A09; Thu, 3 Jan 2019 16:51:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.1 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_WEB,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mira.cbaines.net (Postfix) with ESMTP id 379A116A05 for ; Thu, 3 Jan 2019 16:51:17 +0000 (GMT) Received: from localhost ([127.0.0.1]:56070 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gf6DE-0001ol-N9 for patchwork@mira.cbaines.net; Thu, 03 Jan 2019 11:51:16 -0500 Received: from eggs.gnu.org ([208.118.235.92]:32840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gf6D4-0001mu-3I for guix-patches@gnu.org; Thu, 03 Jan 2019 11:51:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gf6D0-000564-TI for guix-patches@gnu.org; Thu, 03 Jan 2019 11:51:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:35667) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gf6D0-00055w-Q6 for guix-patches@gnu.org; Thu, 03 Jan 2019 11:51:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gf6D0-0006zu-LE for guix-patches@gnu.org; Thu, 03 Jan 2019 11:51:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33963] [PATCH] gnu: octave: Fix makeinfo path configuration Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Jan 2019 16:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33963 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33963@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154653425926887 (code B ref -1); Thu, 03 Jan 2019 16:51:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Jan 2019 16:50:59 +0000 Received: from localhost ([127.0.0.1]:45914 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gf6Cr-0006zT-PX for submit@debbugs.gnu.org; Thu, 03 Jan 2019 11:50:59 -0500 Received: from eggs.gnu.org ([208.118.235.92]:42041) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gf6Cp-0006zL-4f for submit@debbugs.gnu.org; Thu, 03 Jan 2019 11:50:52 -0500 Received: from lists.gnu.org ([208.118.235.17]:58596) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gf6Co-0004uw-JU for submit@debbugs.gnu.org; Thu, 03 Jan 2019 11:50:50 -0500 Received: from eggs.gnu.org ([208.118.235.92]:60981) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gf6Cn-0001TM-Js for guix-patches@gnu.org; Thu, 03 Jan 2019 11:50:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gf6Cj-0004rf-Cr for guix-patches@gnu.org; Thu, 03 Jan 2019 11:50:49 -0500 Received: from vultr.systemreboot.net ([45.77.148.100]:51776) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gf6Ci-0004l7-3M for guix-patches@gnu.org; Thu, 03 Jan 2019 11:50:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Type:MIME-Version:Message-ID:Date: Subject:To:From:Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=NA1ijyzR9VGuu4k2wFxXuoh/2y+XnzGVr9uK5yADIA4=; b=H8/w3+jz3P2ql+wDgcqyWkGS6o fsQZOuTrWPCKd3INcUHYv7JKEsg66TPBqUeghxyKLENfHLlsk5t9bAkt6iwMONmGpCJCJD9oSKpBB u34JEPNuEtMZIdGShLtCYn/s0EwaFR0nPvukAEisDz7HNFoPPT2Sz+0t890DffU0/i9M=; Received: from [103.5.134.173] (helo=steel) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1gf6CZ-0005TH-49 for guix-patches@gnu.org; Thu, 03 Jan 2019 22:20:36 +0530 From: Arun Isaac Date: Thu, 03 Jan 2019 22:20:05 +0530 Message-ID: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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: 208.118.235.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 The makeinfo path now needs to be substituted in libinterp/corefcn/help.h, not libinterp/corefn/help.cc. I have addressed this in the attached patch. I have also filed a bug upstream asking them to add a configure flag --with-makeinfo. Hopefully, we won't have to manually substitute the path to makeinfo in the next release. https://savannah.gnu.org/bugs/index.php?55371 From 36612684f6f7719aef4b1b9fd40632b8749fcd90 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 3 Jan 2019 21:56:26 +0530 Subject: [PATCH] gnu: octave: Fix makeinfo path configuration. * gnu/packages/maths.scm (octave-cli)[arguments]: Fix makeinfo path configuration in configure-makeinfo phase. --- gnu/packages/maths.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 448d9e373..e67bc5e93 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017 Theodoros Foradis -;;; Copyright © 2017 Arun Isaac +;;; Copyright © 2017, 2019 Arun Isaac ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Dave Love ;;; Copyright © 2018 Jan Nieuwenhuizen @@ -1484,11 +1484,10 @@ can solve two kinds of problems: (modify-phases %standard-phases (add-after 'configure 'configure-makeinfo (lambda* (#:key inputs #:allow-other-keys) - (substitute* "libinterp/corefcn/help.cc" - (("Vmakeinfo_program = \"makeinfo\"") - (string-append "Vmakeinfo_program = \"" - (assoc-ref inputs "texinfo") - "/bin/makeinfo\""))) + (substitute* "libinterp/corefcn/help.h" + (("\"makeinfo\"") + (string-append + "\"" (assoc-ref inputs "texinfo") "/bin/makeinfo\""))) #t))))) (home-page "https://www.gnu.org/software/octave/") (synopsis "High-level language for numerical computation") -- 2.19.2