diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-10-27 19:05:33 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-30 20:34:03 +0000 |
| commit | ed0b160041c46d74c81ba849f1f841eb5bdaba1c (patch) | |
| tree | 4ca2574fa47b0ddd1c04361bd010aec19ada289a /postgresql | |
| parent | 036f86db553494c781f58cbb5cbb567774217ec4 (diff) | |
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@googlemail.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'postgresql')
| -rw-r--r-- | postgresql/ExternalProject_postgresql.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/postgresql/ExternalProject_postgresql.mk b/postgresql/ExternalProject_postgresql.mk index c11cdb4e1646..afefab142b33 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 |