From patchwork Tue Mar 1 11:43:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Lissy X-Patchwork-Id: 84928 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 1BECCB7148 for ; Tue, 1 Mar 2011 22:44:27 +1100 (EST) Received: (qmail 11639 invoked by alias); 1 Mar 2011 11:44:21 -0000 Received: (qmail 11618 invoked by uid 22791); 1 Mar 2011 11:44:19 -0000 X-SWARE-Spam-Status: No, hits=-0.5 required=5.0 tests=BAYES_05 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; Tue, 01 Mar 2011 11:44:13 +0000 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApgGAEZrbE0KwQUB/2dsb2JhbACYNY8KuzeFYQSPeQ Received: from unknown (HELO proxy10.zimbra.univ-tours.local) ([10.193.5.1]) by hermes2.univ-tours.fr with ESMTP; 01 Mar 2011 12:44:02 +0100 Received: from localhost (localhost [127.0.0.1]) by proxy10.zimbra.univ-tours.local (Postfix) with ESMTP id 6A29C20040; Tue, 1 Mar 2011 12:44:02 +0100 (CET) Received: from proxy10.zimbra.univ-tours.local ([127.0.0.1]) by localhost (proxy10.zimbra.univ-tours.local [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kz69lqKRsPBV; Tue, 1 Mar 2011 12:44:02 +0100 (CET) Received: from portable-alex.polytech.univ-tours.local (portable-alex.polytech.univ-tours.local [10.108.5.46]) by proxy10.zimbra.univ-tours.local (Postfix) with ESMTP id 2D1F11FE8B; Tue, 1 Mar 2011 12:44:02 +0100 (CET) From: Alexandre Lissy To: gcc-patches@gcc.gnu.org Cc: Alexandre Lissy Subject: [PATCH 2/3] Fix double '/' in MELT build process Date: Tue, 1 Mar 2011 12:43:48 +0100 Message-Id: <1298979829-3027-3-git-send-email-alissy@mandriva.com> In-Reply-To: <1298979829-3027-1-git-send-email-alissy@mandriva.com> References: <1298979829-3027-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 Double slashes while building are a problem for RPM's debugedit tool, which seems to be 'well-known', while never fixed. The only solution is to fix the build process. Also, remove any trailing slash from MELTMODULE_SRCDIR variable, since slashes are added when used. --- gcc/melt-build.tpl | 8 ++++---- gcc/melt-module.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc/melt-build.tpl b/gcc/melt-build.tpl index 20c0012..4666990 100644 --- a/gcc/melt-build.tpl +++ b/gcc/melt-build.tpl @@ -107,7 +107,7 @@ melt-stage0-static/[+base+]-0.so: $(MELT_GENERATED_[+mkvarsuf+]_C_FILES) \ melt-run.h melt-runtime.h melt-runtime.c \ melt-predef.h $(melt_make_cc1_dependency) +$(MELT_MAKE_MODULE) melt_module \ - GCCMELT_MODULE_WORKSPACE=melt-stage0-static/ \ + GCCMELT_MODULE_WORKSPACE=melt-stage0-static \ GCCMELT_CFLAGS="$(melt_cflags)" \ GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/[+base+]-0.c \ GCCMELT_MODULE_BINARY=melt-stage0-static/[+base+]-0 @@ -117,7 +117,7 @@ melt-stage0-dynamic/[+base+]-0.d.so: $(MELT_GENERATED_[+mkvarsuf+]_C_FILES) \ melt-run.h melt-runtime.h melt-runtime.c \ melt-predef.h $(melt_make_cc1_dependency) +$(MELT_MAKE_MODULE) melt_module_dynamic \ - GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic/ \ + GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic \ GCCMELT_CFLAGS="$(melt_cflags)" \ GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/[+base+]-0.c \ GCCMELT_MODULE_BINARY=melt-stage0-dynamic/[+base+]-0 @@ -181,7 +181,7 @@ $(MELT_STAGE_ZERO): melt-run.h melt-runtime.h melt-predef.h \ $(melt_make_cc1_dependency) +$(MELT_MAKE_MODULE) melt_module \ - GCCMELT_MODULE_WORKSPACE=[+melt_stage+]/ \ + GCCMELT_MODULE_WORKSPACE=[+melt_stage+] \ GCCMELT_CFLAGS="$(melt_cflags)" \ GCCMELT_MODULE_SOURCE=[+melt_stage+]/[+ (. outbase)+]-[+(. stageindex)+].c \ GCCMELT_MODULE_BINARY=[+melt_stage+]/[+(. outbase)+]-[+(. stageindex)+] @@ -191,7 +191,7 @@ $(MELT_STAGE_ZERO): melt-run.h melt-runtime.h melt-predef.h \ $(melt_make_cc1_dependency) +$(MELT_MAKE_MODULE) melt_module_withoutline \ - GCCMELT_MODULE_WORKSPACE=[+melt_stage+]/ \ + GCCMELT_MODULE_WORKSPACE=[+melt_stage+] \ GCCMELT_CFLAGS="$(melt_cflags)" \ GCCMELT_MODULE_SOURCE=[+melt_stage+]/[+ (. outbase)+]-[+(. stageindex)+].c \ GCCMELT_MODULE_BINARY=[+melt_stage+]/[+(. outbase)+]-[+(. stageindex)+] diff --git a/gcc/melt-module.mk b/gcc/melt-module.mk index 38dad9b..3f45736 100644 --- a/gcc/melt-module.mk +++ b/gcc/melt-module.mk @@ -46,7 +46,7 @@ endif MELTMODULE_BASENAME:=$(basename $(GCCMELT_MODULE_SOURCE)) MELTMODULE_PLAIN:=$(notdir $(MELTMODULE_BASENAME)) -MELTMODULE_SRCDIR:=$(dir $(GCCMELT_MODULE_SOURCE)) +MELTMODULE_SRCDIR:=$(patsubst %/, %, $(dir $(GCCMELT_MODULE_SOURCE))) ## The .d.so & .n.so suffixes are wired in melt-runtime.c!