From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53497) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dyE2B-0006w7-1X for guix-patches@gnu.org; Sat, 30 Sep 2017 05:26:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dyE26-00019g-Q9 for guix-patches@gnu.org; Sat, 30 Sep 2017 05:26:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:59575) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dyE26-00019S-IU for guix-patches@gnu.org; Sat, 30 Sep 2017 05:26:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dyE26-0002CR-A4 for guix-patches@gnu.org; Sat, 30 Sep 2017 05:26:02 -0400 Subject: [bug#28000] [PATCH] gnu: octave: Reference makeinfo with absolute path. References: In-Reply-To: Resent-Message-ID: Message-Id: <66af43b0.AEQAQ7astGgAAAAAAAAAAAPwTpIAAAACwQwAAAAAAAW9WABZz2Mh@mailjet.com> From: Arun Isaac Date: Sat, 30 Sep 2017 14:55:28 +0530 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 28000@debbugs.gnu.org, mbakke@fastmail.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))) =20 ;; For a fully featured Octave, users are strongly recommended also to in= stall -;; 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=3D" (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 =3D \"makeinfo\"") + (string-append "Vmakeinfo_program =3D \"" + (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 --=20 2.14.1 =