[Libreoffice-commits] .: config_host.mk.in configure.ac cross_toolset/Makefile epm/ExternalProject_epm.mk fontconfig/ExternalProject_fontconfig.mk freetype/ExternalProject_freetype.mk hunspell/ExternalProject_hunspell.mk lcms2/makefile.mk libcdr/ExternalProject_libcdr.mk liborcus/ExternalProject_liborcus.mk librsvg/ExternalProject_librsvg.mk libwpd/ExternalProject_libwpd.mk Makefile.top mythes/ExternalProject_mythes.mk openldap/ExternalProject_openldap.mk postgresql/ExternalProject_postgresql.mk solenv/bin
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Oct 30 13:34:41 PDT 2012
Makefile.top | 36 +++----
config_host.mk.in | 4
configure.ac | 145 +++++++++++--------------------
cross_toolset/Makefile | 2
epm/ExternalProject_epm.mk | 2
fontconfig/ExternalProject_fontconfig.mk | 2
freetype/ExternalProject_freetype.mk | 2
hunspell/ExternalProject_hunspell.mk | 2
lcms2/makefile.mk | 2
libcdr/ExternalProject_libcdr.mk | 2
liborcus/ExternalProject_liborcus.mk | 2
librsvg/ExternalProject_librsvg.mk | 2
libwpd/ExternalProject_libwpd.mk | 2
mythes/ExternalProject_mythes.mk | 2
openldap/ExternalProject_openldap.mk | 2
postgresql/ExternalProject_postgresql.mk | 7 -
solenv/bin/build.pl | 3
solenv/bin/callcatcher.Makefile | 4
18 files changed, 90 insertions(+), 133 deletions(-)
New commits:
commit ed0b160041c46d74c81ba849f1f841eb5bdaba1c
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Oct 27 19:05:33 2012 +0200
fix parallelism variables and let's have only --with-parallelism from now on
Rationale:
- it is advised to use max-jobs and num-cpus with the same value in wiki
- max-jobs was used only for lcms2 and few gbuild
modules outside of tail_build anyway.
Also fixes:
- really use CHECK_PARALLELISM when meant to
- EXTMAXPROCESS is not defined in gbuild;
use parent's jobservers in sub-make where possible
Change-Id: I501de732d223ce0c935081bd1d73da611d16ee88
Reviewed-on: https://gerrit.libreoffice.org/930
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/Makefile.top b/Makefile.top
index 715a7a8..47df97a 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -255,7 +255,7 @@ define gbuild_module_rules
.PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).subsequentcheck $(1).deliver
$(1): bootstrap fetch
- cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) gb_PARTIALBUILD=T
+ cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) gb_PARTIALBUILD=T
$(1).all: bootstrap fetch
$$(if $$(filter $(1),$$(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules)), \
@@ -264,16 +264,16 @@ $(1).all: bootstrap fetch
, \
cd $(1) && unset MAKEFLAGS && \
) \
- $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
+ $(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM)
$(1).build:
- cd $(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) build gb_PARTIALBUILD=T
+ cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) build gb_PARTIALBUILD=T
$(1).check:
- cd $(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) check gb_PARTIALBUILD=T
+ cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) check gb_PARTIALBUILD=T
$(1).clean:
- cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) clean gb_PARTIALBUILD=T
+ cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) clean gb_PARTIALBUILD=T
$(1).subsequentcheck:
cd $(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) subsequentcheck gb_PARTIALBUILD=T
@@ -292,11 +292,11 @@ define dmake_module_rules
$(1): bootstrap fetch
cd $(1) && unset MAKEFLAGS && \
- $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM)
+ $(SOLARENV)/bin/build.pl -P$(PARALLELISM) -- -P$(PARALLELISM)
$(1).all: bootstrap fetch
cd $(1) && unset MAKEFLAGS && \
- $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
+ $(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM)
$(1).deliver: $(1)
cd $(1) && $(SOLARENV)/bin/deliver.pl
@@ -333,7 +333,7 @@ clean: clean-host clean-build
clean-host:
ifeq ($(BUILD_DMAKE),YES)
- if [ -f dmake/Makefile ] ; then $(GNUMAKE) -j $(GMAKE_PARALLELISM) -C dmake clean; fi
+ if [ -f dmake/Makefile ] ; then $(GNUMAKE) -j $(PARALLELISM) -C dmake clean; fi
endif
rm -fr $(DEVINSTALLDIR)
rm -fr $(OUTDIR)
@@ -355,7 +355,7 @@ include $(SRCDIR)/compilerplugins/Makefile.mk
#
distclean : clean compilerplugins-clean
ifeq ($(BUILD_DMAKE),YES)
- (if [ -f dmake/Makefile ] ; then $(GNUMAKE) -j $(GMAKE_PARALLELISM) -C dmake distclean; fi) && \
+ (if [ -f dmake/Makefile ] ; then $(GNUMAKE) -j $(PARALLELISM) -C dmake distclean; fi) && \
rm -f solenv/*/bin/dmake*
endif
rm -fr config_host.mk config_build.mk aclocal.m4 autom4te.cache \
@@ -413,25 +413,25 @@ ifeq ($(DISABLE_DBCONNECTIVITY),TRUE)
cd connectivity && sed -e 's/^\(export [A-Z0-9_]*=\)\(.*\)$$/\1"\2"/' <../config_host.mk >conftmp.sh && . conftmp.sh && rm conftmp.sh && $(SOLARENV)/bin/deliver.pl
endif
cd packimages && unset MAKEFLAGS && \
- $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) && \
- $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS)
+ $(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM) && \
+ $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
build: build-packimages
ifeq ($(OS_FOR_BUILD),WNT)
cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl
else
cd instsetoo_native && unset MAKEFLAGS && \
- $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM)
+ $(SOLARENV)/bin/build.pl -P$(PARALLELISM) -- -P$(PARALLELISM)
endif
ifeq ($(OS),ANDROID)
- cd android && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS)
+ cd android && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
endif
build-nocheck : export SKIP_TESTS := YES
build-nocheck : build
cross-toolset: bootstrap fetch
- cd cross_toolset && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS)
+ cd cross_toolset && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
ifneq (WNT,$(OS))
# We need to build nss for nsinstall... See NSINSTALL=... in nss/makefile.mk
@@ -556,16 +556,16 @@ findunusedcode:
check: dev-install subsequentcheck
subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install)
- $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
+ $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
unitcheck:
- $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
+ $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
slowcheck:
- $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
+ $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
debugrun:
- $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
+ $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
endif # not clean or distclean
diff --git a/config_host.mk.in b/config_host.mk.in
index 31f40b1..cb38d43 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -39,7 +39,6 @@ export BSH_JAR=@BSH_JAR@
export BSH_TARBALL=@BSH_TARBALL@
export BUILD_DMAKE=@BUILD_DMAKE@
export BUILD_MOZAB=@BUILD_MOZAB@
-export BUILD_NCPUS=@BUILD_NCPUS@
export BUILD_PLATFORM=@build@
export BUILD_POSTGRESQL_SDBC=@BUILD_POSTGRESQL_SDBC@
export BUILD_TYPE=@BUILD_TYPE@
@@ -206,8 +205,7 @@ export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@
export GIT_REPO_NAMES=@GIT_REPO_NAMES@
export GLIB_CFLAGS=@GLIB_CFLAGS@
export GLIB_LIBS=@GLIB_LIBS@
-export GMAKE_MODULE_PARALLELISM=@GMAKE_MODULE_PARALLELISM@
-export GMAKE_PARALLELISM=@GMAKE_PARALLELISM@
+export PARALLELISM=@PARALLELISM@
export GNOMEVFS_CFLAGS=@GNOMEVFS_CFLAGS@
export GNOMEVFS_LIBS=@GNOMEVFS_LIBS@
@x_GNUCP@ export GNUCOPY=@GNUCP@
diff --git a/configure.ac b/configure.ac
index 978f3b8..2acf0d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2126,24 +2126,18 @@ AC_ARG_WITH(sun-templates,
[Integrate Sun template packages.]),
,)
-AC_ARG_WITH(num-cpus,
- AS_HELP_STRING([--with-num-cpus],
- [Number of build processes/cpus to use (number of projects that will build at the same time).
- Multi-process/multi-cpu builds can save a lot of time on multi-cpu machines.
- Defaults to the number of CPUs on the machine.]),
-,)
-
-AC_ARG_WITH(max-jobs,
- AS_HELP_STRING([--with-max-jobs],
- [Maximum number of jobs that will be issued at the same time per dmake or gbuild subproject.
- The real number of the jobs is affected by the --with-num-cpus too, it can get up to CPUS*max_jobs.
- Defaults to 1, unless you configure --enable-icecream - then to 10.]),
+AC_ARG_WITH(parallelism,
+ AS_HELP_STRING([--with-parallelism],
+ [Number of jobs to run simultaneously during build. Parallel builds can save a lot
+ of time on multi-cpu machines. The real number of jobs can get up to parallelism*parallelism
+ for a while in the first build phase. That will not happen when dmake is removed.
+ Defaults to the number of CPUs on the machine, unless you configure --enable-icecream - then to 10.]),
,)
AC_ARG_WITH(check-jobs,
AS_HELP_STRING([--with-check-jobs],
[Maximum number of jobs that will be issued at the same time during 'make subsequenttest'.
- Default value is the same as 'max-jobs'. Useful because the subsequent tests are very lighweight.]),
+ Default value is the same as 'parallelism'. Useful because the subsequent tests are very lightweight.]),
,)
dnl ===================================================================
@@ -4130,8 +4124,7 @@ if test "$cross_compiling" = "yes"; then
--disable-mozilla \
--disable-postgresql-sdbc \
--disable-zenity \
- --with-num-cpus="$with_num_cpus" \
- --with-max-jobs="$with_max_jobs" \
+ --with-parallelism="$with_parallelism" \
--without-doxygen \
$sub_conf_opts \
2>&1 | sed -e 's/^/ /'
@@ -12525,32 +12518,58 @@ dnl ===================================================================
dnl Number of CPUs to use during the build
dnl ===================================================================
AC_MSG_CHECKING([for number of processors to use])
-if test -n "$with_num_cpus"; then
- BUILD_NCPUS=$with_num_cpus
+if test -n "$with_parallelism"; then
+ PARALLELISM=$with_parallelism
else
- case `uname -s` in
+ if test "$enable_icecream" = "yes"; then
+ PARALLELISM="10"
+ else
+ case `uname -s` in
- Darwin|FreeBSD|NetBSD|OpenBSD)
- BUILD_NCPUS=`sysctl -n hw.ncpu`
- ;;
+ Darwin|FreeBSD|NetBSD|OpenBSD)
+ PARALLELISM=`sysctl -n hw.ncpu`
+ ;;
- Linux)
- BUILD_NCPUS=`getconf _NPROCESSORS_ONLN`
- ;;
- # what else than above does profit here *and* has /proc?
- *)
- BUILD_NCPUS=`grep $'^processor\t*:' /proc/cpuinfo | wc -l`
+ Linux)
+ PARALLELISM=`getconf _NPROCESSORS_ONLN`
;;
- esac
+ # what else than above does profit here *and* has /proc?
+ *)
+ PARALLELISM=`grep $'^processor\t*:' /proc/cpuinfo | wc -l`
+ ;;
+ esac
+
+ # If we hit the catch-all case, but /proc/cpuinfo doesn't exist or has an
+ # unexpected format, 'wc -l' will have returned 0.
+ if test "$PARALLELISM" -eq 0; then
+ PARALLELISM=1
+ fi
+ fi
+fi
- # If we hit the catch-all case, but /proc/cpuinfo doesn't exist or has an
- # unexpected format, 'wc -l' will have returned 0.
- if test "$BUILD_NCPUS" -eq 0; then
- BUILD_NCPUS=1
+if test "$no_parallelism_make" = "YES" && test $PARALLELISM -gt 1; then
+ if test -z "$with_parallelism"; then
+ AC_MSG_WARN([gmake 3.81 crashes with parallelism > 1, reducing it to 1. upgrade to 3.82 to avoid this.])
+ add_warning "gmake 3.81 crashes with parallelism > 1, reducing it to 1. upgrade to 3.82 to avoid this."
+ PARALLELISM="1"
+ else
+ add_warning "make 3.81 is prone to crashes with parallelism > 1. Since --with-parallelism was explicitly given, it is honored, but do not complain when make segfaults on you."
fi
fi
-AC_MSG_RESULT([$BUILD_NCPUS])
-AC_SUBST(BUILD_NCPUS)
+
+AC_MSG_RESULT([$PARALLELISM])
+AC_SUBST(PARALLELISM)
+
+# ===================================================================
+# Number of parallel jobs to be executed during subsequenttest
+# ===================================================================
+AC_MSG_CHECKING([for maximum no. of jobs during subsequenttest])
+CHECK_PARALLELISM=$PARALLELISM
+if test "$with_check_jobs" != ""; then
+ CHECK_PARALLELISM="$with_check_jobs"
+fi
+AC_MSG_RESULT([$CHECK_PARALLELISM])
+AC_SUBST(CHECK_PARALLELISM)
#
# Set up ILIB for MSVC build
@@ -12604,21 +12623,6 @@ fi
AC_SUBST(MERGELIBS)
dnl ===================================================================
-dnl Number of parallel jobs to be executed by dmake
-dnl ===================================================================
-AC_MSG_CHECKING([for maximum of jobs per processor])
-BUILD_MAX_JOBS="1"
-if test "$with_max_jobs" != ""; then
- BUILD_MAX_JOBS="$with_max_jobs"
-else
- if test "$enable_icecream" = "yes"; then
- BUILD_MAX_JOBS="10"
- fi
-fi
-AC_MSG_RESULT([$BUILD_MAX_JOBS])
-AC_SUBST(BUILD_MAX_JOBS)
-
-dnl ===================================================================
dnl icerun is a wrapper that stops us spawning tens of processes
dnl locally - for tools that can't be executed on the compile cluster
dnl this avoids a dozen javac's ganging up on your laptop to kill it.
@@ -12629,49 +12633,6 @@ if test "$enable_icecream" = "yes"; then
fi
AC_SUBST(ICECREAM_RUN)
-# =====================================================================
-# determine the parallelism for gnu make
-# =====================================================================
-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
-GMAKE_MODULE_PARALLELISM="$BUILD_MAX_JOBS"
-if test "$no_parallelism_make" = "YES"; then
- if test -z "$with_num_cpus"; then
- GMAKE_PARALLELISM="1"
- if test $GMAKE_MODULE_PARALLELISM -gt 1; then
- AC_MSG_WARN([gmake 3.81 crashes with parallelism > 1, reducing it to 1. upgrade to 3.82 to avoid this.])
- if test -z "$with_num_cpus"; then
- add_warning "gmake 3.81 crashes with parallelism > 1, reducing it to 1. upgrade to 3.82 to avoid this."
- fi
- GMAKE_MODULE_PARALLELISM="1"
- fi
- else
- GMAKE_PARALLELISM="$BUILD_NCPUS"
- add_warning "make 3.81 is prone to crashes with parallelism > 1. Since --with-num-cpus was explicitly given, it is honored, but do not complain when make segfault on you."
- fi
-fi
-
-# GMAKE_PARALLELISM is used in tail_build
-# GMAKE_MODULE_PARALLELISM is used when building individual gbuildified module
-AC_MSG_RESULT([per module:$GMAKE_MODULE_PARALLELISM, for tail_build:$GMAKE_PARALLELISM])
-AC_SUBST(GMAKE_PARALLELISM)
-AC_SUBST(GMAKE_MODULE_PARALLELISM)
-
-dnl ===================================================================
-dnl Number of parallel jobs to be executed during subsequenttest
-dnl ===================================================================
-AC_MSG_CHECKING([for maximum no. of jobs during subsequenttest])
-CHECK_PARALLELISM=$GMAKE_PARALLELISM
-if test "$with_check_jobs" != ""; then
- CHECK_PARALLELISM="$with_check_jobs"
-fi
-AC_MSG_RESULT([$CHECK_PARALLELISM])
-AC_SUBST(CHECK_PARALLELISM)
-
dnl ===================================================================
dnl Setting up the environment.
dnl ===================================================================
diff --git a/cross_toolset/Makefile b/cross_toolset/Makefile
index 2448493..2ea3619 100644
--- a/cross_toolset/Makefile
+++ b/cross_toolset/Makefile
@@ -9,5 +9,5 @@ include ../config_build.mk
.PHONY : build
build:
- $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
+ $(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM)
diff --git a/epm/ExternalProject_epm.mk b/epm/ExternalProject_epm.mk
index 7229942..ca81384 100644
--- a/epm/ExternalProject_epm.mk
+++ b/epm/ExternalProject_epm.mk
@@ -19,7 +19,7 @@ $(call gb_ExternalProject_get_state_target,epm,build) :
cd $(EXTERNAL_WORKDIR) \
&& ./configure --disable-fltk \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________NONE) \
- && $(GNUMAKE) \
+ && $(MAKE) \
&& touch $@
# vim: set noet sw=4 ts=4:
diff --git a/fontconfig/ExternalProject_fontconfig.mk b/fontconfig/ExternalProject_fontconfig.mk
index 294c6b2..296db71 100644
--- a/fontconfig/ExternalProject_fontconfig.mk
+++ b/fontconfig/ExternalProject_fontconfig.mk
@@ -28,7 +28,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) :
--with-expat-lib=$(OUTDIR)/lib \
--with-freetype-config=$(OUTDIR)/bin/freetype-config \
--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
- && $(GNUMAKE) \
+ && $(MAKE) \
&& touch $@
# vim: set noet sw=4 ts=4:
diff --git a/freetype/ExternalProject_freetype.mk b/freetype/ExternalProject_freetype.mk
index f689e2e..914007b 100644
--- a/freetype/ExternalProject_freetype.mk
+++ b/freetype/ExternalProject_freetype.mk
@@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,freetype,build) :
--prefix=$(OUTDIR) --includedir=$(OUTDIR)/inc/external \
--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
&& chmod +x builds/unix/freetype-config \
- && $(GNUMAKE) \
+ && $(MAKE) \
&& touch $@
# vim: set noet sw=4 ts=4:
diff --git a/hunspell/ExternalProject_hunspell.mk b/hunspell/ExternalProject_hunspell.mk
index 91cf31c..aab825c 100644
--- a/hunspell/ExternalProject_hunspell.mk
+++ b/hunspell/ExternalProject_hunspell.mk
@@ -22,7 +22,7 @@ $(call gb_ExternalProject_get_state_target,hunspell,build):
$(if $(filter AIX,$(OS)),CFLAGS="-D_LINUX_SOURCE_COMPAT") \
$(if $(filter C53,$(COM)),CFLAGS="-xc99=none") \
$(if $(filter-out WNTGCC,$(GUI)$(COM)),,LDFLAGS="-Wl,--enable-runtime-pseudo-reloc-v2") \
- && $(GNUMAKE) -j$(EXTMAXPROCESS) \
+ && $(MAKE) \
&& touch $@
# vim: set noet sw=4 ts=4:
diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk
index 86f3620..01011f2 100644
--- a/lcms2/makefile.mk
+++ b/lcms2/makefile.mk
@@ -85,7 +85,7 @@ CONFIGURE_FLAGS += \
CONFIGURE_ACTION += --disable-shared
.ENDIF
-BUILD_ACTION = $(GNUMAKE) -j$(GMAKE_MODULE_PARALLELISM)
+BUILD_ACTION = $(GNUMAKE) -j$(PARALLELISM)
.ENDIF # "$(GUI)$(COM)"=="WNTMSC"
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index 4982b8c..83267dd 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -72,7 +72,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
--disable-debug \
--disable-werror \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
- && (cd $(EXTERNAL_WORKDIR)/src/lib && $(GNUMAKE) -j$(EXTMAXPROCESS)) \
+ && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \
&& touch $@
endif
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
index cc12050..637c449 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
--disable-spreadsheet-model \
$(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(OUTDIR)/inc/external) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
- && $(GNUMAKE) \
+ && $(MAKE) \
&& touch $@
endif
diff --git a/librsvg/ExternalProject_librsvg.mk b/librsvg/ExternalProject_librsvg.mk
index 6ad34d8..f0bcff6 100644
--- a/librsvg/ExternalProject_librsvg.mk
+++ b/librsvg/ExternalProject_librsvg.mk
@@ -30,6 +30,6 @@ $(call gb_ExternalProject_get_state_target,librsvg,build) :
LIBRSVG_LIBS="-L$(OUTDIR)/lib -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2) -lcairo -lintl" \
CFLAGS="-I$(OUTDIR)/inc/external -I$(OUTDIR)/inc/external/glib-2.0 -I$(OUTDIR)/inc/external/gdk-pixbuf-2.0 -I$(OUTDIR)/inc/external/pango-1.0 -I$(OUTDIR)/inc/cairo" \
LDFLAGS="$(foreach lib,cairo.2 gio-2.0.0 glib-2.0.0 gmodule-2.0.0 gobject-2.0.0 gthread-2.0.0 intl.8 pango-1.0.0,-Wl,-dylib_file, at loader_path/lib$(lib).dylib:$(OUTDIR)/lib/lib$(lib).dylib) $(if $(filter YES,$(SYSTEM_LIBXML)),,-Wl,-dylib_file, at loader_path/../ure-link/lib/libxml2.2.dylib:$(OUTDIR)/lib/libxml2.2.dylib)" \
- && PATH=$(OUTDIR_FOR_BUILD)/bin:$$PATH $(GNUMAKE) -j$(EXTMAXPROCESS) \
+ && PATH=$(OUTDIR_FOR_BUILD)/bin:$$PATH $(MAKE) \
&& touch $@
# vim: set noet sw=4 ts=4:
diff --git a/libwpd/ExternalProject_libwpd.mk b/libwpd/ExternalProject_libwpd.mk
index 4d1ea61..b0cb692 100644
--- a/libwpd/ExternalProject_libwpd.mk
+++ b/libwpd/ExternalProject_libwpd.mk
@@ -46,7 +46,7 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) :
--disable-debug \
$(if $(filter MACOSX,$(OS)),--disable-werror) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
- && $(GNUMAKE) -j$(EXTMAXPROCESS) \
+ && $(MAKE) \
&& touch $@
endif
diff --git a/mythes/ExternalProject_mythes.mk b/mythes/ExternalProject_mythes.mk
index 392e69d..e88d793 100644
--- a/mythes/ExternalProject_mythes.mk
+++ b/mythes/ExternalProject_mythes.mk
@@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,mythes,build):
HUNSPELL_CFLAGS=" $(HUNSPELL_CFLAGS)" \
HUNSPELL_LIBS=" $(HUNSPELL_LIBS)" \
$(if $(filter C52U,$(COM)$(CPU)),CFLAGS="-m64") \
- && $(GNUMAKE) -j$(EXTMAXPROCESS) \
+ && $(MAKE) \
&& touch $@
# vim: set noet sw=4 ts=4:
diff --git a/openldap/ExternalProject_openldap.mk b/openldap/ExternalProject_openldap.mk
index 41a7b43..5f739f0 100644
--- a/openldap/ExternalProject_openldap.mk
+++ b/openldap/ExternalProject_openldap.mk
@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,openldap,build) :
CFLAGS="-I $(OUTDIR)/inc/mozilla/nss -I $(OUTDIR)/inc/mozilla/nspr" \
LDFLAGS="-L$(OUTDIR)/lib" \
) \
- && unset MAKEFLAGS && $(GNUMAKE) -j$(GMAKE_PARALLELISM) \
+ && MAKEFLAGS= && $(MAKE) \
&& touch $@
# vim: set noet sw=4 ts=4:
diff --git a/postgresql/ExternalProject_postgresql.mk b/postgresql/ExternalProject_postgresql.mk
index c11cdb4..afefab1 100644
--- a/postgresql/ExternalProject_postgresql.mk
+++ b/postgresql/ExternalProject_postgresql.mk
@@ -21,9 +21,9 @@ ifeq ($(OS)$(COM),WNTMSC)
$(call gb_ExternalProject_get_state_target,postgresql,build) :
cd $(EXTERNAL_WORKDIR)/src \
- && unset MAKEFLAGS \
- && nmake -f win32.mak USE_SSL=1 USE_LDAP=1 \
+ && MAKEFLAGS= && nmake -f win32.mak USE_SSL=1 USE_LDAP=1 \
&& touch $@
+
else
$(call gb_ExternalProject_get_state_target,postgresql,build) :
@@ -35,8 +35,7 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) :
$(if $(filter YES,$(WITH_GSSAPI)),--with-gssapi) \
$(if $(filter NO,$(SYSTEM_OPENLDAP)),CPPFLAGS="-I$(OUTDIR)/inc/openldap" LDFLAGS="-L$(OUTDIR)/lib" EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4") \
&& cd src/interfaces/libpq \
- && unset MAKEFLAGS \
- && $(GNUMAKE) -j$(EXTMAXPROCESS) all-static-lib libpq-flags.mk \
+ && MAKEFLAGS= && $(MAKE) all-static-lib libpq-flags.mk \
&& touch $@
endif
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index b754f16..c8e62ee 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1901,11 +1901,10 @@ sub run_job {
{
return 1 if (! $path =~ /prj$/ );
mkpath("$workdir/Logs");
- my $gbuild_flags = '-j' . $ENV{GMAKE_MODULE_PARALLELISM};
+ my $gbuild_flags = '-j' . $ENV{PARALLELISM};
my $gbuild_target = 'all slowcheck';
if ($registered_name =~ /tail_build\/prj$/ )
{
- $gbuild_flags = '-j' . $ENV{GMAKE_PARALLELISM};
$gbuild_target = $ENV{gb_TAILBUILDTARGET};
}
$gbuild_flags .= ' ' . $ENV{GMAKE_OPTIONS};
diff --git a/solenv/bin/callcatcher.Makefile b/solenv/bin/callcatcher.Makefile
index b0164ef..e6d262a 100644
--- a/solenv/bin/callcatcher.Makefile
+++ b/solenv/bin/callcatcher.Makefile
@@ -24,9 +24,9 @@ include $(SOLARENV)/gbuild/gbuild.mk
findunusedcode:
cd instsetoo_native && unset MAKEFLAGS && \
- $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
+ $(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM)
ooinstall -l $(DEVINSTALLDIR)/opt
- $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post subsequentcheck
+ $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post subsequentcheck
callanalyse \
$(WORKDIR)/LinkTarget/*/* \
*/$(OUTPATH)/bin/* \
More information about the Libreoffice-commits
mailing list