Patchwork [MELT] Fix CUMULMD5 leading space

login
register
mail settings
Submitter Alexandre Lissy
Date Sept. 14, 2011, 1:01 p.m.
Message ID <1316005302-17878-1-git-send-email-alissy@mandriva.com>
Download mbox | patch
Permalink /patch/114677/
State New
Headers show

Comments

Alexandre Lissy - Sept. 14, 2011, 1:01 p.m.
Since v3.82, make issued some strange warning on duplicated targets. It
turns out that those were due to a leading space hidden in CUMULMD5
variable, leading to target breakage.
---
 gcc/ChangeLog.MELT |    4 ++++
 gcc/melt-build.mk  |   18 +++++++++---------
 gcc/melt-build.tpl |    2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

Patch

diff --git a/gcc/ChangeLog.MELT b/gcc/ChangeLog.MELT
index 78c6ae6..6efd8d9 100644
--- a/gcc/ChangeLog.MELT
+++ b/gcc/ChangeLog.MELT
@@ -1,3 +1,7 @@ 
+2011-09-14  Alexandre Lissy  <alissy@mandriva.com>
+	* melt-build.tpl: Remove leading space on CUMULMD5, breaking some make
+	targets.
+	* melt-build.mk: Regenerate.
 
 2011-09-14  Basile Starynkevitch  <basile@starynkevitch.net>
 	* melt-runtime.c (melt_dbgshortbacktrace): Print just the basename
diff --git a/gcc/melt-build.mk b/gcc/melt-build.mk
index af9e266..fd9d8a2 100644
--- a/gcc/melt-build.mk
+++ b/gcc/melt-build.mk
@@ -15,7 +15,7 @@ 
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
-#@ from melt-build.tpl line 21 generated by Autogen 5.12 using melt-build.def
+#@ from melt-build.tpl line 21 generated by Autogen 5.11.9 using melt-build.def
 
 
 ## the following Makefile variables are expected to be set
@@ -147,7 +147,7 @@  MELT_GENERATED_FIRST_C_FILES= \
 MELT_GENERATED_FIRST_BASE= \
                   $(basename $(notdir $(MELT_GENERATED_FIRST_C_FILES)))
 
-MELT_GENERATED_FIRST_CUMULMD5 := $(shell $(GAWK) -F\" '/melt_cumulated_hexmd5/{print $$2}' $(melt_make_source_dir)/generated/warmelt-first+meltdesc.c) 
+MELT_GENERATED_FIRST_CUMULMD5 := $(shell $(GAWK) -F\" '/melt_cumulated_hexmd5/{print $$2}' $(melt_make_source_dir)/generated/warmelt-first+meltdesc.c)
 
 #@ from melt-build.tpl line 135
 MELT_GENERATED_BASE_C_FILES= \
@@ -156,7 +156,7 @@  MELT_GENERATED_BASE_C_FILES= \
 MELT_GENERATED_BASE_BASE= \
                   $(basename $(notdir $(MELT_GENERATED_BASE_C_FILES)))
 
-MELT_GENERATED_BASE_CUMULMD5 := $(shell $(GAWK) -F\" '/melt_cumulated_hexmd5/{print $$2}' $(melt_make_source_dir)/generated/warmelt-base+meltdesc.c) 
+MELT_GENERATED_BASE_CUMULMD5 := $(shell $(GAWK) -F\" '/melt_cumulated_hexmd5/{print $$2}' $(melt_make_source_dir)/generated/warmelt-base+meltdesc.c)
 
 #@ from melt-build.tpl line 135
 MELT_GENERATED_DEBUG_C_FILES= \
@@ -165,7 +165,7 @@  MELT_GENERATED_DEBUG_C_FILES= \
 MELT_GENERATED_DEBUG_BASE= \
                   $(basename $(notdir $(MELT_GENERATED_DEBUG_C_FILES)))
 
-MELT_GENERATED_DEBUG_CUMULMD5 := $(shell $(GAWK) -F\" '/melt_cumulated_hexmd5/{print $$2}' $(melt_make_source_dir)/generated/warmelt-debug+meltdesc.c) 
+MELT_GENERATED_DEBUG_CUMULMD5 := $(shell $(GAWK) -F\" '/melt_cumulated_hexmd5/{print $$2}' $(melt_make_source_dir)/generated/warmelt-debug+meltdesc.c)
 
 #@ from melt-build.tpl line 135
 MELT_GENERATED_MACRO_C_FILES= \
@@ -174,7 +174,7 @@  MELT_GENERATED_MACRO_C_FILES= \
 MELT_GENERATED_MACRO_BASE= \
                   $(basename $(notdir $(MELT_GENERATED_MACRO_C_FILES)))
 
-MELT_GENERATED_MACRO_CUMULMD5 := $(shell $(GAWK) -F\" '/melt_cumulated_hexmd5/{print $$2}' $(melt_make_source_dir)/generated/warmelt-macro+meltdesc.c) 
+MELT_GENERATED_MACRO_CUMULMD5 := $(shell $(GAWK) -F\" '/melt_cumulated_hexmd5/{print $$2}' $(melt_make_source_dir)/generated/warmelt-macro+meltdesc.c)
 
 #@ from melt-build.tpl line 135
 MELT_GENERATED_NORMAL_C_FILES= \
@@ -183,7 +183,7 @@  MELT_GENERATED_NORMAL_C_FILES= \
 MELT_GENERATED_NORMAL_BASE= \
                   $(basename $(notdir $(MELT_GENERATED_NORMAL_C_FILES)))
 
-MELT_GENERATED_NORMAL_CUMULMD5 := $(shell $(GAWK) -F\" '/melt_cumulated_hexmd5/{print $$2}' $(melt_make_source_dir)/generated/warmelt-normal+meltdesc.c) 
+MELT_GENERATED_NORMAL_CUMULMD5 := $(shell $(GAWK) -F\" '/melt_cumulated_hexmd5/{print $$2}' $(melt_make_source_dir)/generated/warmelt-normal+meltdesc.c)
 
 #@ from melt-build.tpl line 135
 MELT_GENERATED_NORMATCH_C_FILES= \
@@ -192,7 +192,7 @@  MELT_GENERATED_NORMATCH_C_FILES= \
 MELT_GENERATED_NORMATCH_BASE= \
                   $(basename $(notdir $(MELT_GENERATED_NORMATCH_C_FILES)))
 
-MELT_GENERATED_NORMATCH_CUMULMD5 := $(shell $(GAWK) -F\" '/melt_cumulated_hexmd5/{print $$2}' $(melt_make_source_dir)/generated/warmelt-normatch+meltdesc.c) 
+MELT_GENERATED_NORMATCH_CUMULMD5 := $(shell $(GAWK) -F\" '/melt_cumulated_hexmd5/{print $$2}' $(melt_make_source_dir)/generated/warmelt-normatch+meltdesc.c)
 
 #@ from melt-build.tpl line 135
 MELT_GENERATED_GENOBJ_C_FILES= \
@@ -201,7 +201,7 @@  MELT_GENERATED_GENOBJ_C_FILES= \
 MELT_GENERATED_GENOBJ_BASE= \
                   $(basename $(notdir $(MELT_GENERATED_GENOBJ_C_FILES)))
 
-MELT_GENERATED_GENOBJ_CUMULMD5 := $(shell $(GAWK) -F\" '/melt_cumulated_hexmd5/{print $$2}' $(melt_make_source_dir)/generated/warmelt-genobj+meltdesc.c) 
+MELT_GENERATED_GENOBJ_CUMULMD5 := $(shell $(GAWK) -F\" '/melt_cumulated_hexmd5/{print $$2}' $(melt_make_source_dir)/generated/warmelt-genobj+meltdesc.c)
 
 #@ from melt-build.tpl line 135
 MELT_GENERATED_OUTOBJ_C_FILES= \
@@ -210,7 +210,7 @@  MELT_GENERATED_OUTOBJ_C_FILES= \
 MELT_GENERATED_OUTOBJ_BASE= \
                   $(basename $(notdir $(MELT_GENERATED_OUTOBJ_C_FILES)))
 
-MELT_GENERATED_OUTOBJ_CUMULMD5 := $(shell $(GAWK) -F\" '/melt_cumulated_hexmd5/{print $$2}' $(melt_make_source_dir)/generated/warmelt-outobj+meltdesc.c) 
+MELT_GENERATED_OUTOBJ_CUMULMD5 := $(shell $(GAWK) -F\" '/melt_cumulated_hexmd5/{print $$2}' $(melt_make_source_dir)/generated/warmelt-outobj+meltdesc.c)
 
 
 melt-workdir:
diff --git a/gcc/melt-build.tpl b/gcc/melt-build.tpl
index 76b36e7..5558714 100644
--- a/gcc/melt-build.tpl
+++ b/gcc/melt-build.tpl
@@ -139,7 +139,7 @@  MELT_GENERATED_[+mkvarsuf+]_C_FILES= \
 MELT_GENERATED_[+mkvarsuf+]_BASE= \
                   $(basename $(notdir $(MELT_GENERATED_[+mkvarsuf+]_C_FILES)))
 
-MELT_GENERATED_[+mkvarsuf+]_CUMULMD5 := $(shell $(GAWK) -F\" '/melt_cumulated_hexmd5/{print $$2}' $(melt_make_source_dir)/generated/[+base+]+meltdesc.c) 
+MELT_GENERATED_[+mkvarsuf+]_CUMULMD5 := $(shell $(GAWK) -F\" '/melt_cumulated_hexmd5/{print $$2}' $(melt_make_source_dir)/generated/[+base+]+meltdesc.c)
 [+ENDFOR melt_translator_file+]
 
 melt-workdir: