diff options
| author | ryoon <ryoon@pkgsrc.org> | 2015-07-16 11:55:26 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2015-07-16 11:55:26 +0000 |
| commit | d33eda6bafa3db0e7752c702a9eb703ce2ffde3b (patch) | |
| tree | 95dc37736d86289b553dc2ec2db7af4495ff488b /misc | |
| parent | 3d33374e6c44cf1b4d011d4e7f5bc3f9f2331d71 (diff) | |
| download | pkgsrc-d33eda6bafa3db0e7752c702a9eb703ce2ffde3b.tar.gz | |
Fix parallel build mechanism.
From asau@.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/libreoffice4/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/misc/libreoffice4/Makefile b/misc/libreoffice4/Makefile index 02a3ca63594..2135b800d46 100644 --- a/misc/libreoffice4/Makefile +++ b/misc/libreoffice4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2015/07/15 15:09:38 wiz Exp $ +# $NetBSD: Makefile,v 1.74 2015/07/16 11:55:26 ryoon Exp $ VERREL= 4.4.4 VERRC= 3 @@ -129,14 +129,14 @@ HAS_CONFIGURE= yes # Do not use /tmp, outside of WRKSRC. CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp -.if defined(MAKE_JOBS_SAFE) && !empty(MAKE_JOBS_SAFE:M[nN][oO]) -CONFIGURE_ARGS+= --with-parallelism=1 -.else -# --with-parallelism conficts with -jN. -MAKE_JOBS_SAFE= no +MAKE_JOBS_SAFE= no # --with-parallelism conficts with -jN +.if !empty(MAKE_JOBS) CONFIGURE_ARGS+= --with-parallelism=${MAKE_JOBS} +.else +CONFIGURE_ARGS+= --with-parallelism=1 .endif + CONFIGURE_ARGS+= --prefix=${PREFIX}/${PKGNAME_NOREV} CONFIGURE_ARGS+= --disable-ccache CONFIGURE_ARGS+= --enable-dbus |