[Libreoffice-commits] .: configure.in set_soenv.in tail_build/prj

[Norbert Thiebaud]

 configure.in               |   12 ++++++++++++
 set_soenv.in               |    1 +
 tail_build/prj/makefile.mk |    2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 9b981cafaac2d0ad265ad6105fd3715bfc041051
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Aug 9 15:52:50 2011 -0500

    Adjust the parallelism of tail_build to be max(max-process, num-cpus)
    
    tail_build run mostly by itself and wrap a dozen of module,
    using just MAXPROCESS for the parallelism force to limit NB_CPUS
    in order to avoid a NB_CPUS x MAXPROCESS scenario.
    This mitigate this problem, until we don;t need MAXPROCESS anymore
    and NB_CPUS becomes the only driving force.

diff --git a/configure.in b/configure.in
index f9d6d37..f245355 100755
--- a/configure.in
+++ b/configure.in
@@ -9026,6 +9026,18 @@ fi
 AC_MSG_RESULT([$BUILD_MAX_JOBS])
 AC_SUBST(BUILD_MAX_JOBS)
 
+# =====================================================================
+# determine the parallelism for tail_build
+# =====================================================================
+AC_MSG_CHECKING([for maximum parallelism for gmake])
+if test $BUILD_MAX_JOBS -gt $BUILD_NCPUS ; then
+    GMAKE_PARALLELISM="$BUILD_MAX_JOBS"
+else
+    GMAKE_PARALLELISM="$BUILD_NCPUS"
+fi
+AC_MSG_RESULT([$GMAKE_PARALLELISM])
+AC_SUBST(GMAKE_PARALLELISM)
+
 dnl ===================================================================
 dnl Setting up the environment.
 dnl ===================================================================
diff --git a/set_soenv.in b/set_soenv.in
index cf802b3..e12f64a 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1814,6 +1814,7 @@ else
    ToFile( "SOLARLIB_FOR_BUILD", $SOLARLIB,      "e" );
    ToFile( "WORKDIR_FOR_BUILD", $WORKDIR,        "e" );
 }
+ToFile( "GMAKE_PARALLELISM",    "@GMAKE_PARALLELISM@", "e" );
 ToFile( "SIZEOF_SHORT",         "@SIZEOF_SHORT@", "e" );
 ToFile( "SIZEOF_INT",           "@SIZEOF_INT@",  "e" );
 ToFile( "SIZEOF_LONG",          "@SIZEOF_LONG@", "e" );
diff --git a/tail_build/prj/makefile.mk b/tail_build/prj/makefile.mk
index e312a7c..63e3f19 100644
--- a/tail_build/prj/makefile.mk
+++ b/tail_build/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
 .ENDIF
 
 all:
-    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog