Re: [Libreoffice] [PATCH] remove build.pl --gmake option refrences from Makefile
Hi Norbert, On Sat, Sep 3, 2011 at 10:05 PM, Norbert Thiebaud nthieb...@gmail.com wrote: I know I should use a better email client than gmail... but until I finally get around to develop a reasonable proficiency in mutt, extracting patch from inline content is pretty error prone (line wrapping and other horror stories)). You may want to explore IMAP support for gmail in case you are not aware of it. You can activate it in gmail options. I use it to handle my gmail traffic with Evolution and it's working well for me. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] remove build.pl --gmake option refrences from Makefile
The --gmake option was removed from build.pl in commit 4103138 This patch removes the remaining references from Makefile. From 7e32982dc47dd14cb813a8e3bc393cc38c82e929 Mon Sep 17 00:00:00 2001 From: Peter Foley pefol...@verizon.net Date: Sat, 3 Sep 2011 20:49:15 -0400 Subject: [PATCH] remove build.pl --gmake option refrences from Makefile --- Makefile.in | 16 +--- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Makefile.in b/Makefile.in index 8c7f803..154611a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2,12 +2,6 @@ SHELL=/usr/bin/env bash -ifeq ($(USE_GMAKE),) -GBUILD_OPT:= -else -GBUILD_OPT:=--gmake -endif - ifeq (@CROSS_COMPILING@,YES) CROSS_TOOLSET_RULE:=cross-build-toolset else @@ -17,12 +11,12 @@ endif all: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded $(CROSS_TOOLSET_RULE) @. ./Env.Host.sh \ cd instsetoo_native \ -build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ +build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ cross-build-toolset: @. ./Env.Build.sh \ cd cross_toolset \ - build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ + build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ install: @. ./Env.Host.sh \ @@ -43,7 +37,7 @@ dev-install: @. ./Env.Host.sh \ cd smoketestoo_native \ export SAL_USE_VCLPLUGIN=svp \ - build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all:instsetoo_native -- -P@BUILD_MAX_JOBS@ \ + build.pl -P@BUILD_NCPUS@ --all:instsetoo_native -- -P@BUILD_MAX_JOBS@ \ cd @abs_builddir@ ln -s $$SOLARVER/$$INPATH/installation/opt/ install \ echo \ $$SOLARENV/bin/linkoo $$SRC_ROOT/install $$SRC_ROOT \ @@ -101,7 +95,7 @@ check: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ fetch @. ./Env.Host.sh \ cd smoketestoo_native \ export SAL_USE_VCLPLUGIN=svp \ -build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ +build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ @. ./Env.Host.sh $$SOLARENV/bin/subsequenttests id: @@ -125,7 +119,7 @@ findunusedcode: source (sed -e s,$$INPATH,callcatcher,g ./Env.Host.sh) \ . ./solenv/bin/callcatchEnv.Set.sh \ cd instsetoo_native \ - build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ + build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ @. ./Env.Host.sh \ source (sed -e s,$$INPATH,callcatcher,g ./Env.Host.sh) \ callanalyse \ -- 1.7.6.1 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] remove build.pl --gmake option refrences from Makefile
On Sat, Sep 3, 2011 at 7:54 PM, Peter Foley pefol...@verizon.net wrote: The --gmake option was removed from build.pl in commit 4103138 This patch removes the remaining references from Makefile. yep, my mess. I did not clean-up completely... thanks for taking care of that. Could you be kind enough to re-send these patch as attachments, it would make my life easier yeah, I know I should use a better email client than gmail... but until I finally get around to develop a reasonable proficiency in mutt, extracting patch from inline content is pretty error prone (line wrapping and other horror stories)). thanks. Norbert From 7e32982dc47dd14cb813a8e3bc393cc38c82e929 Mon Sep 17 00:00:00 2001 From: Peter Foley pefol...@verizon.net Date: Sat, 3 Sep 2011 20:49:15 -0400 Subject: [PATCH] remove build.pl --gmake option refrences from Makefile --- Makefile.in | 16 +--- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Makefile.in b/Makefile.in index 8c7f803..154611a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2,12 +2,6 @@ SHELL=/usr/bin/env bash -ifeq ($(USE_GMAKE),) -GBUILD_OPT:= -else -GBUILD_OPT:=--gmake -endif - ifeq (@CROSS_COMPILING@,YES) CROSS_TOOLSET_RULE:=cross-build-toolset else @@ -17,12 +11,12 @@ endif all: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded $(CROSS_TOOLSET_RULE) @. ./Env.Host.sh \ cd instsetoo_native \ - build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ + build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ cross-build-toolset: @. ./Env.Build.sh \ cd cross_toolset \ - build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ + build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ install: @. ./Env.Host.sh \ @@ -43,7 +37,7 @@ dev-install: @. ./Env.Host.sh \ cd smoketestoo_native \ export SAL_USE_VCLPLUGIN=svp \ - build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all:instsetoo_native -- -P@BUILD_MAX_JOBS@ \ + build.pl -P@BUILD_NCPUS@ --all:instsetoo_native -- -P@BUILD_MAX_JOBS@ \ cd @abs_builddir@ ln -s $$SOLARVER/$$INPATH/installation/opt/ install \ echo \ $$SOLARENV/bin/linkoo $$SRC_ROOT/install $$SRC_ROOT \ @@ -101,7 +95,7 @@ check: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ fetch @. ./Env.Host.sh \ cd smoketestoo_native \ export SAL_USE_VCLPLUGIN=svp \ - build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ + build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ @. ./Env.Host.sh $$SOLARENV/bin/subsequenttests id: @@ -125,7 +119,7 @@ findunusedcode: source (sed -e s,$$INPATH,callcatcher,g ./Env.Host.sh) \ . ./solenv/bin/callcatchEnv.Set.sh \ cd instsetoo_native \ - build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ + build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ @. ./Env.Host.sh \ source (sed -e s,$$INPATH,callcatcher,g ./Env.Host.sh) \ callanalyse \ -- 1.7.6.1 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
