[Libreoffice-commits] .: 2 commits - Makefile.in set_soenv.in solenv/gbuild

[Jan Holesovsky]

 Makefile.in                                     |    1 -
 set_soenv.in                                    |    1 +
 solenv/gbuild/extensions/post_AuxTargets.mk     |    2 +-
 solenv/gbuild/extensions/post_BuildplTargets.mk |    2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4c41530eeda7d09d1607db7e697df6007c16d892
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Nov 28 21:06:26 2011 +0100

    Use the build.pl parallelism again.

diff --git a/Makefile.in b/Makefile.in
index 5ae3d96..b1680f3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,7 +7,6 @@ SHELL=/usr/bin/env bash
 define forward_to_gbuild
 @GNUMAKE@ -f $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/GNUmakefile.mk \
 	$(if @VERBOSE@,,-s) \
-	--jobs="@GMAKE_PARALLELISM@" \
 	$(1)
 endef
 
diff --git a/set_soenv.in b/set_soenv.in
index 3818f2b..b723e14 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1771,6 +1771,7 @@ else
    ToFile( "SOLARLIB_FOR_BUILD", $SOLARLIB,      "e" );
    ToFile( "WORKDIR_FOR_BUILD", $WORKDIR,        "e" );
 }
+ToFile( "BUILD_NCPUS",          "@BUILD_NCPUS@", "e" );
 ToFile( "GMAKE_PARALLELISM",    "@GMAKE_PARALLELISM@", "e" );
 ToFile( "GMAKE_MODULE_PARALLELISM","@GMAKE_MODULE_PARALLELISM@", "e" );
 ToFile( "SIZEOF_SHORT",         "@SIZEOF_SHORT@", "e" );
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 0dcc15a..182c8ae 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -50,7 +50,7 @@ gb_MAKETARGET=all
 endif
 
 define gb_BuildplTarget_command
-cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl --all gb_MAKETARGET=$(gb_MAKETARGET)
+cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -P$(GMAKE_PARALLELISM) gb_MAKETARGET=$(gb_MAKETARGET)
 endef
 
 .PHONY: smoketestoo_native instsetoo_native cross-build-toolset dev-install all build
commit 7c292efd35e7925c0521d7cb1caab1410ae6f2bc
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Nov 28 21:06:10 2011 +0100

    Fix typo.

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk
index fff1c10..c947ee3 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -62,7 +62,7 @@ clean-host:
 clean-build:
 	if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake clean; fi
 	rm -f solenv/*/bin/dmake*
-	rm -rf $(SRCDIR)*/$(INPATH_FOR_BUILD)
+	rm -rf $(SRCDIR)/*/$(INPATH_FOR_BUILD)
 
 distclean: clean
 	if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake clean; fi