This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: recommend use of gperf version 3


Joseph S. Myers wrote:
> If the required version of any tool is changed then the documentation of
> that version in install.texi needs to be updated accordingly.

Here is an updated patch.

> The generated files in CVS will also need to be regenerated on commit.

Yes. The one who commits it for me will have to do
  $ rm -f cp/cfns.h java/keyword.h
and rebuild and commit these files.


ChangeLog:
2005-06-06  Bruno Haible  <bruno@clisp.org>

	* doc/install.texi: Mention requirement for gperf-3.0.1.

cp/ChangeLog:
2005-06-05  Bruno Haible  <bruno@clisp.org>

	* Make-lang.in ($(srcdir)/cp/cfns.h): Use gperf option -m 10.
	Bail out if gperf is too old.

java/ChangeLog:
2005-06-05  Bruno Haible  <bruno@clisp.org>

	* Make-lang.in ($(srcdir)/java/keyword.h): Use gperf option -m 10.

*** gcc-4.0.0/gcc/cp/Make-lang.in.bak	Tue Jan 18 12:45:31 2005
--- gcc-4.0.0/gcc/cp/Make-lang.in	Sun Jun  5 17:26:28 2005
***************
*** 97,104 ****
  
  # Special build rules.
  $(srcdir)/cp/cfns.h: $(srcdir)/cp/cfns.gperf
! 	gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \
! 		$(srcdir)/cp/cfns.gperf > $(srcdir)/cp/cfns.h
  
  gtype-cp.h gt-cp-call.h gt-cp-decl.h gt-cp-decl2.h : s-gtype; @true
  gt-cp-pt.h gt-cp-repo.h gt-cp-parser.h gt-cp-method.h : s-gtype; @true
--- 97,108 ----
  
  # Special build rules.
  $(srcdir)/cp/cfns.h: $(srcdir)/cp/cfns.gperf
! 	gperf -o -C -E -N 'libc_name_p' -L ANSI-C -m 10 \
! 		$(srcdir)/cp/cfns.gperf > c$$$$.h || { \
! 	echo "Please update gperf from ftp://ftp.gnu.org/pub/gnu/gperf/"; >&2; \
! 	rm -f c$$$$.h; \
! 	exit 1; } ; \
! 	mv -f c$$$$.h $(srcdir)/cp/cfns.h
  
  gtype-cp.h gt-cp-call.h gt-cp-decl.h gt-cp-decl2.h : s-gtype; @true
  gt-cp-pt.h gt-cp-repo.h gt-cp-parser.h gt-cp-method.h : s-gtype; @true
*** gcc-4.0.0/gcc/java/Make-lang.in.bak	Sat Mar 12 03:16:28 2005
--- gcc-4.0.0/gcc/java/Make-lang.in	Sun Jun  5 17:24:01 2005
***************
*** 87,93 ****
  
  $(srcdir)/java/keyword.h: $(srcdir)/java/keyword.gperf
  	(cd $(srcdir)/java || exit 1; \
! 	gperf -L ANSI-C -C -F ', 0' -p -t -j1 -i 1 -g -o -N java_keyword -k1,4,$$ \
  		keyword.gperf > k$$$$.h || { \
  	echo "Please update gperf from ftp://ftp.gnu.org/pub/gnu/gperf/"; >&2; \
  	rm -f k$$$$.h; \
--- 87,93 ----
  
  $(srcdir)/java/keyword.h: $(srcdir)/java/keyword.gperf
  	(cd $(srcdir)/java || exit 1; \
! 	gperf -L ANSI-C -C -F ', 0' -p -t -N java_keyword -m 10 \
  		keyword.gperf > k$$$$.h || { \
  	echo "Please update gperf from ftp://ftp.gnu.org/pub/gnu/gperf/"; >&2; \
  	rm -f k$$$$.h; \


*** gcc-4.0.0/gcc/doc/install.texi.bak	2005-04-20 15:41:31.000000000 +0200
--- gcc-4.0.0/gcc/doc/install.texi	2005-06-06 14:59:04.000000000 +0200
***************
*** 332,338 ****
  
  Needed to regenerate @file{gcc.pot}.
  
! @item gperf version 2.7.2 (or later)
  
  Necessary when modifying @command{gperf} input files, e.g.@:
  @file{gcc/cp/cfns.gperf} to regenerate its associated header file, e.g.@:
--- 332,338 ----
  
  Needed to regenerate @file{gcc.pot}.
  
! @item gperf version 3.0.1 (or later)
  
  Necessary when modifying @command{gperf} input files, e.g.@:
  @file{gcc/cp/cfns.gperf} to regenerate its associated header file, e.g.@:


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]