GNU bug report logs - #33963
[PATCH] gnu: octave: Fix makeinfo path configuration

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 33963 in the body.
You can then email your comments to 33963 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: octave: Fix makeinfo path configuration
Date: Thu, 03 Jan 2019 22:20:05 +0530

[Message part 1 (text/plain, inline)]

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

[0001-gnu-octave-Fix-makeinfo-path-configuration.patch (text/x-patch, inline)]

From 36612684f6f7719aef4b1b9fd40632b8749fcd90 Mon Sep 17 00:00:00 2001
From: Arun Isaac <arunisaac <at> systemreboot.net>
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 <ng0 <at> n0.is>
 ;;; Copyright © 2017 Ben Woodcroft <donttrustben <at> gmail.com>
 ;;; Copyright © 2017 Theodoros Foradis <theodoros <at> foradis.org>
-;;; Copyright © 2017 Arun Isaac <arunisaac <at> systemreboot.net>
+;;; Copyright © 2017, 2019 Arun Isaac <arunisaac <at> systemreboot.net>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2017 Dave Love <me <at> fx <at> gnu.org>
 ;;; Copyright © 2018 Jan Nieuwenhuizen <janneke <at> gnu.org>
@@ -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

[signature.asc (application/pgp-signature, inline)]

Message #8 received at 33963 <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kkebreau <at> posteo.net>
To: Arun Isaac <arunisaac <at> systemreboot.net>
Cc: 33963 <at> debbugs.gnu.org
Subject: Re: [bug#33963] [PATCH] gnu: octave: Fix makeinfo path configuration
Date: Fri, 04 Jan 2019 22:24:30 -0500

[Message part 1 (text/plain, inline)]

Arun Isaac <arunisaac <at> systemreboot.net> writes:

> 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 <arunisaac <at> systemreboot.net>
> 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 <ng0 <at> n0.is>
>  ;;; Copyright © 2017 Ben Woodcroft <donttrustben <at> gmail.com>
>  ;;; Copyright © 2017 Theodoros Foradis <theodoros <at> foradis.org>
> -;;; Copyright © 2017 Arun Isaac <arunisaac <at> systemreboot.net>
> +;;; Copyright © 2017, 2019 Arun Isaac <arunisaac <at> systemreboot.net>
>  ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me <at> tobias.gr>
>  ;;; Copyright © 2017 Dave Love <me <at> fx <at> gnu.org>
>  ;;; Copyright © 2018 Jan Nieuwenhuizen <janneke <at> gnu.org>
> @@ -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")

LGTM.

[signature.asc (application/pgp-signature, inline)]

Message #13 received at 33963-done <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: Kei Kebreau <kkebreau <at> posteo.net>
Cc: 33963-done <at> debbugs.gnu.org
Subject: Re: [bug#33963] [PATCH] gnu: octave: Fix makeinfo path configuration
Date: Sat, 05 Jan 2019 23:55:18 +0530

[Message part 1 (text/plain, inline)]

Pushed, thanks for the review!

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.