From patchwork Wed Sep 14 13:01:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Lissy X-Patchwork-Id: 114677 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id B695CB70C2 for ; Wed, 14 Sep 2011 23:03:00 +1000 (EST) Received: (qmail 32680 invoked by alias); 14 Sep 2011 13:02:58 -0000 Received: (qmail 32658 invoked by uid 22791); 14 Sep 2011 13:02:56 -0000 X-SWARE-Spam-Status: No, hits=-1.1 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from hermes.univ-tours.fr (HELO hermes.univ-tours.fr) (193.52.209.50) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 14 Sep 2011 13:02:11 +0000 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApwEADelcE4KbAUi/2dsb2JhbABBqF6CUyiBFxK+K4ZuBJh5i20 Received: from unknown (HELO portable-alex.polytech.univ-tours.local) ([10.108.5.34]) by hermes2.univ-tours.fr with ESMTP; 14 Sep 2011 14:54:59 +0200 From: Alexandre Lissy To: gcc-patches@gcc.gnu.org, gcc-melt@googlegroups.com Cc: basile@starynkevitch.net, Alexandre Lissy Subject: [PATCH] [MELT] Fix CUMULMD5 leading space Date: Wed, 14 Sep 2011 15:01:42 +0200 Message-Id: <1316005302-17878-1-git-send-email-alissy@mandriva.com> X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org 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(-) 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 + * melt-build.tpl: Remove leading space on CUMULMD5, breaking some make + targets. + * melt-build.mk: Regenerate. 2011-09-14 Basile Starynkevitch * 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: