Patchwork (build) Patch to fix cp/cfns.gperf building issues

login
register
mail settings
Submitter Mike Stump
Date April 22, 2011, 10:54 p.m.
Message ID <514AA7B6-0B41-42BD-B39B-71E9434E152D@comcast.net>
Download mbox | patch
Permalink /patch/92589/
State New
Headers show

Comments

Mike Stump - April 22, 2011, 10:54 p.m.
On Apr 22, 2011, at 8:12 AM, Nicola Pero wrote:
> This patch fixes a building annoyance that I had when building on a new
> machine (an x86_64 gnu/linux box).
> 
> The building failed.  It was down to two problems:
> 
> * due to how I got a copy of the GCC source code on the machine, the timestamp
> of each source file was the timestamp of when it was copied to the machine (ie,
> a random timestamp from the point of view of the building system).  This caused
> the build system to decide that $(srcdir)/cp/cfns.h needed to be rebuilt from
> $(srcdir)/cp/cfns.gperf (it didn't, obviously; the source code was trunk with
> no changes).

Additionally,

  contrib/gcc_update --touch

can be used to to fix the time stamps until such time as someone changes the gperf rule to be under maintainer mode.

So, only the dependency should go away under a maintainer rules, as in the below, not the entire rule.

Ok?
2011-04-22  Mike Stump  <mikestump@comcast.net>

	* Make-lang.in: Only run gperf in maintainer mode.

Patch

Index: cp/Make-lang.in
===================================================================
--- cp/Make-lang.in	(revision 172670)
+++ cp/Make-lang.in	(working copy)
@@ -105,7 +105,10 @@  cc1plus$(exeext): $(CXX_OBJS) cc1plus-ch
 	      $(CXX_OBJS) cc1plus-checksum.o $(BACKEND) $(LIBS) $(BACKENDLIBS)
 
 # Special build rules.
+ifneq ($(MAINT),)
 $(srcdir)/cp/cfns.h: $(srcdir)/cp/cfns.gperf
+endif
+$(srcdir)/cp/cfns.h:
 	gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \
 		$(srcdir)/cp/cfns.gperf > $(srcdir)/cp/cfns.h