all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Arun Isaac <arunisaac@systemreboot.net>
To: 28000@debbugs.gnu.org, mbakke@fastmail.com
Subject: [bug#28000] [PATCH] gnu: octave: Reference makeinfo with absolute path.
Date: Sat, 30 Sep 2017 14:55:28 +0530	[thread overview]
Message-ID: <66af43b0.AEQAQ7astGgAAAAAAAAAAAPwTpIAAAACwQwAAAAAAAW9WABZz2Mh@mailjet.com> (raw)
In-Reply-To: <c470797a.AEQAOK6C9kgAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZiERt@mailjet.com>

* gnu/packages/maths.scm (octave)[arguments]: Add configure-makeinfo phase.
[inputs]: Add texinfo.
[native-inputs]: Remove texinfo.
---
 gnu/packages/maths.scm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index f326f6af7..5c2ab05d1 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1126,7 +1126,7 @@ can solve two kinds of problems:
     (license license:bsd-3)))
 
 ;; For a fully featured Octave, users  are strongly recommended also to install
-;; the following packages: texinfo, less, ghostscript, gnuplot.
+;; the following packages: less, ghostscript, gnuplot.
 (define-public octave
   (package
     (name "octave")
@@ -1158,6 +1158,7 @@ can solve two kinds of problems:
        ("glu" ,glu)
        ("zlib" ,zlib)
        ("curl" ,curl)
+       ("texinfo" ,texinfo)
        ("graphicsmagick" ,graphicsmagick)))
     (native-inputs
      `(("lzip" ,lzip)
@@ -1172,14 +1173,23 @@ can solve two kinds of problems:
        ;; will still run without them, albeit without the features they
        ;; provide.
        ("less" ,less)
-       ("texinfo" ,texinfo)
        ("ghostscript" ,ghostscript)
        ("gnuplot" ,gnuplot)))
     (arguments
      `(#:configure-flags
        (list (string-append "--with-shell="
                             (assoc-ref %build-inputs "bash")
-                            "/bin/sh"))))
+                            "/bin/sh"))
+       #:phases
+       (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\"")))
+             #t)))))
     (home-page "https://www.gnu.org/software/octave/")
     (synopsis "High-level language for numerical computation")
     (description "GNU Octave is a high-level interpreted language that is
-- 
2.14.1


  parent reply	other threads:[~2017-09-30  9:26 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-07 10:43 [bug#28000] [PATCH] gnu: octave: Build with texinfo Arun Isaac
2017-08-07 22:13 ` Marius Bakke
2017-09-26 13:23   ` Arun Isaac
2017-08-07 22:18 ` [bug#28000] [Mail Delivery System] Undelivered Mail Returned to Sender Marius Bakke
2017-09-30  9:25 ` Arun Isaac [this message]
2017-10-04 14:37   ` [bug#28000] [PATCH] gnu: octave: Reference makeinfo with absolute path Ludovic Courtès
2017-10-05 22:09     ` bug#28000: " Arun Isaac

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=66af43b0.AEQAQ7astGgAAAAAAAAAAAPwTpIAAAACwQwAAAAAAAW9WABZz2Mh@mailjet.com \
    --to=arunisaac@systemreboot.net \
    --cc=28000@debbugs.gnu.org \
    --cc=mbakke@fastmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.