From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggsout.gnu.org ([209.51.188.92]:58265 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gfcb7-0001dd-Eb for guix-patches@gnu.org; Fri, 04 Jan 2019 22:26:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gfcb4-0003Kr-Af for guix-patches@gnu.org; Fri, 04 Jan 2019 22:26:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:52949) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gfcb4-0003Kh-1c for guix-patches@gnu.org; Fri, 04 Jan 2019 22:26:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gfcb3-00063Z-NB for guix-patches@gnu.org; Fri, 04 Jan 2019 22:26:01 -0500 Subject: [bug#33963] [PATCH] gnu: octave: Fix makeinfo path configuration Resent-Message-ID: From: Kei Kebreau References: Date: Fri, 04 Jan 2019 22:24:30 -0500 In-Reply-To: (Arun Isaac's message of "Thu, 03 Jan 2019 22:20:05 +0530") Message-ID: <8736q7bxch.fsf@posteo.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" 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: Arun Isaac Cc: 33963@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Arun Isaac 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 > 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 =C2=A9 2017 Nils Gillmann > ;;; Copyright =C2=A9 2017 Ben Woodcroft > ;;; Copyright =C2=A9 2017 Theodoros Foradis > -;;; Copyright =C2=A9 2017 Arun Isaac > +;;; Copyright =C2=A9 2017, 2019 Arun Isaac > ;;; Copyright =C2=A9 2017, 2018 Tobias Geerinckx-Rice > ;;; Copyright =C2=A9 2017 Dave Love > ;;; Copyright =C2=A9 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 =3D \"makeinfo\"") > - (string-append "Vmakeinfo_program =3D \"" > - (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. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlwwI24ACgkQ5qXuPBlG eg2kGQ//eycgLCJkWe+cdlnuhLZ/cIb9kzNKsum7q7bir36jvBWkG+Jbe8khTeq6 lgvZ+c5N9rVcVD/8MOys4ygp7ScyuyIH3iPshM5Er+pXr/wJznI+Lczmf1qr0UcG Hc44yadC22sJT3EOLridUYoLjqUfymsxIMmHIMAKeycCbB3gQlJwxp5VgP+9SM75 5rEB7NywAEH0ZdqT7DVjueXseTjJhnk1rHpl1DAkoAcCB9KJwzrD8anDynKr0zJq DW+P0Iqtby3hbdMPHAuog6a8p5RmeBNdPFxoWnoEP40HGlqeH572tzWeC+Dsop2g 1vl2VjsQU3yd+7/MBMVB+VZ+ibLHsha4Lx/5zMkh6GPQG0jyE6eqoZ8Yz8TJxHEN WfCP66eqbiF1nto0JwY67gfop6HRpXujhlb7NVVLxPln/p1WoYDZEt+P9L30puoa UArCv0cKfGLLeuom1LUSDrM4Gjg1/NbvCwwe9F2p15RHidx/iEO4aCNIOWdOf0Q/ kQiy3kVZ0abrz7hXn9Y/y4L7XdPkbU4eDMT+wjqVQGwZiM7eJtM3DGpLXWyoI/PN nEt80idw1AU0BQG5lFvolyIqxxz6F7zN5ygy/nZGdPzZIHA6yM7wxHjEdZ5V7Mg0 q7/ZimUlwv0Uuy3M1Vue4X19I6HA3aL3kyyLMZ3m5qMkEzx7M78= =2VAj -----END PGP SIGNATURE----- --=-=-=--