all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#33963] [PATCH] gnu: octave: Fix makeinfo path configuration
@ 2019-01-03 16:50 Arun Isaac
  2019-01-05  3:24 ` Kei Kebreau
  0 siblings, 1 reply; 3+ messages in thread
From: Arun Isaac @ 2019-01-03 16:50 UTC (permalink / raw)
  To: 33963


[-- Attachment #1.1: Type: text/plain, Size: 376 bytes --]


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


[-- Attachment #1.2: 0001-gnu-octave-Fix-makeinfo-path-configuration.patch --]
[-- Type: text/x-patch, Size: 1951 bytes --]

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


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [bug#33963] [PATCH] gnu: octave: Fix makeinfo path configuration
  2019-01-03 16:50 [bug#33963] [PATCH] gnu: octave: Fix makeinfo path configuration Arun Isaac
@ 2019-01-05  3:24 ` Kei Kebreau
  2019-01-05 18:25   ` bug#33963: " Arun Isaac
  0 siblings, 1 reply; 3+ messages in thread
From: Kei Kebreau @ 2019-01-05  3:24 UTC (permalink / raw)
  To: Arun Isaac; +Cc: 33963

[-- Attachment #1: Type: text/plain, Size: 2476 bytes --]

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* bug#33963: [PATCH] gnu: octave: Fix makeinfo path configuration
  2019-01-05  3:24 ` Kei Kebreau
@ 2019-01-05 18:25   ` Arun Isaac
  0 siblings, 0 replies; 3+ messages in thread
From: Arun Isaac @ 2019-01-05 18:25 UTC (permalink / raw)
  To: Kei Kebreau; +Cc: 33963-done

[-- Attachment #1: Type: text/plain, Size: 32 bytes --]


Pushed, thanks for the review!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-01-05 18:26 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-03 16:50 [bug#33963] [PATCH] gnu: octave: Fix makeinfo path configuration Arun Isaac
2019-01-05  3:24 ` Kei Kebreau
2019-01-05 18:25   ` bug#33963: " Arun Isaac

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.