From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:32840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gf6D4-0001mu-3I for guix-patches@gnu.org; Thu, 03 Jan 2019 11:51:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gf6D0-000564-TI for guix-patches@gnu.org; Thu, 03 Jan 2019 11:51:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:35667) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gf6D0-00055w-Q6 for guix-patches@gnu.org; Thu, 03 Jan 2019 11:51:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gf6D0-0006zu-LE for guix-patches@gnu.org; Thu, 03 Jan 2019 11:51:02 -0500 Subject: [bug#33963] [PATCH] gnu: octave: Fix makeinfo path configuration Resent-Message-ID: Received: from eggs.gnu.org ([208.118.235.92]:60981) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gf6Cn-0001TM-Js for guix-patches@gnu.org; Thu, 03 Jan 2019 11:50:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gf6Cj-0004rf-Cr for guix-patches@gnu.org; Thu, 03 Jan 2019 11:50:49 -0500 Received: from vultr.systemreboot.net ([45.77.148.100]:51776) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gf6Ci-0004l7-3M for guix-patches@gnu.org; Thu, 03 Jan 2019 11:50:45 -0500 Received: from [103.5.134.173] (helo=steel) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1gf6CZ-0005TH-49 for guix-patches@gnu.org; Thu, 03 Jan 2019 22:20:36 +0530 From: Arun Isaac Date: Thu, 03 Jan 2019 22:20:05 +0530 Message-ID: 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: 33963@debbugs.gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain 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 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-octave-Fix-makeinfo-path-configuration.patch Content-Transfer-Encoding: quoted-printable From=2036612684f6f7719aef4b1b9fd40632b8749fcd90 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. =2D-- 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 =2D-- 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 =2D;;; 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) =2D (substitute* "libinterp/corefcn/help.cc" =2D (("Vmakeinfo_program =3D \"makeinfo\"") =2D (string-append "Vmakeinfo_program =3D \"" =2D (assoc-ref inputs "texinfo") =2D "/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") =2D-=20 2.19.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAlwuPT0ACgkQLiXui2GA K7O3Dgf/b1AN1GjyFAwkbI7GeevUNNQv818n5hs/NmwwFzysDn49NJqPnyL4dcSB ymO7lYSymgsAhUaGpy0E1cmhcZWGkUQ7cJt5fCgmjEnzv87DSplstOv4aw5T5/HL 5q6Wyg0Am+yHTjQJb62zE+flmypLTnwkIvS2MXC6aqgAmCmIRJ0/pWHgd37baAvJ HDcmqAQXp/KL/nla3i+EBbDsNCNd/NFfOIALj+edeI6bFNcDm9Ql90hKmiEkiYXJ 3dKKG5RbDbRUrYrrLs0gWdvYkzbCjnbyOggnL/rpQRQ5pePxFRT43fH43D16H3bc R3N24bu7FERpGacUqVLbTdu7pywUJA== =gSZX -----END PGP SIGNATURE----- --==-=-=--