This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
Re: [patch] require makeinfo 4.2 or better
- From: cgd at broadcom dot com
- To: mark at codesourcery dot com,drow at mvista dot com
- Cc: gcc-patches at gcc dot gnu dot org,dj at redhat dot com,binutils at sources dot redhat dot com
- Date: 02 May 2003 18:33:39 -0700
- Subject: Re: [patch] require makeinfo 4.2 or better
- References: <yov5znm4df6m.fsf@broadcom.com><200305030112.h431CbA00420@greed.delorie.com><mailpost.1051924375.21845@news-sj1-1>
At Sat, 3 May 2003 01:12:55 +0000 (UTC), "DJ Delorie" wrote:
> I think for this patch, manually applying it to both Makefile.tpl and
> Makefile.in would be acceptable.
>
> Oh, and... approved ;-)
Thanks, i've applied to both gcc and src repositories.
I suppose with the recent changes to use --no-split instead, this
patch may not be strictly necessary on the GCC 3.3 branch, but it
could be a boon to people building combined-tree builds with gcc +
binutils 2.14 (and whatever texinfo happens to be installed on their
systems).
An alternative is to convert the binutils release branch
Makefile.{in,tpl} to use --no-split instead (or to use both patches
8-), i guess.
Thoughts?
Mark? How about this for the gcc 3.3 branch? (And, now, or after
3.3? 8-)
Daniel, which (or both) would you like to see on the binutils branch?
cgd
--
2003-05-02 Chris Demetriou <cgd@broadcom.com>
* Makefile.tpl: Require "makeinfo" from texinfo 4.2 or later.
* Makefile.in: Regenerate.
Index: Makefile.tpl
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.tpl,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile.tpl
--- Makefile.tpl 28 Apr 2003 02:23:46 -0000 1.44
+++ Makefile.tpl 2 May 2003 21:10:25 -0000
@@ -194,13 +194,13 @@ M4 = `if [ -f $$r/m4/m4 ] ; \
then echo $$r/m4/m4 ; \
else echo ${DEFAULT_M4} ; fi`
-# For an installed makeinfo, we require it to be from texinfo 4 or
+# For an installed makeinfo, we require it to be from texinfo 4.2 or
# higher, else we use the "missing" dummy.
MAKEINFO=@MAKEINFO@
USUAL_MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
then echo $$r/texinfo/makeinfo/makeinfo ; \
else if (makeinfo --version \
- | egrep 'texinfo[^0-9]*([1-3][0-9]|[4-9])') >/dev/null 2>&1; \
+ | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \
then echo makeinfo; else echo $$s/missing makeinfo; fi; fi`
# This just becomes part of the MAKEINFO definition passed down to