mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix parallelism variables and let's have only --with-parallelism from now on

Browse Source 
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@googlemail.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
Matúš Kukan
2012-10-27 19:05:33 +02:00
committed by Michael Stahl
parent 036f86db55
commit ed0b160041
18 changed files with 91 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
postgresql/ExternalProject_postgresql.mk
View File

@@ -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