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 /librsvg | |
| 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 'librsvg')
| -rw-r--r-- | librsvg/ExternalProject_librsvg.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/librsvg/ExternalProject_librsvg.mk b/librsvg/ExternalProject_librsvg.mk index 6ad34d8a85d3..f0bcff604fa8 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,@loader_path/lib$(lib).dylib:$(OUTDIR)/lib/lib$(lib).dylib) $(if $(filter YES,$(SYSTEM_LIBXML)),,-Wl,-dylib_file,@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: |