CVS commit: pkgsrc/misc/libreoffice

["Paul Goyette" <pgoyette%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pgoyette
Date:           Mon Jul  4 04:37:53 UTC 2022

Modified Files:
        pkgsrc/misc/libreoffice: Makefile

Log Message:
Handle MAKE_JOBS.${PKGNAME} when dealing with the MAKE_JOBS_SAFE vs.
--with-parallelism stuff

"Looks fine" from wiz@


To generate a diff of this commit:
cvs rdiff -u -r1.286 -r1.287 pkgsrc/misc/libreoffice/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/libreoffice/Makefile
diff -u pkgsrc/misc/libreoffice/Makefile:1.286 pkgsrc/misc/libreoffice/Makefile:1.287
--- pkgsrc/misc/libreoffice/Makefile:1.286      Thu Jun 30 11:18:38 2022
+++ pkgsrc/misc/libreoffice/Makefile    Mon Jul  4 04:37:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.286 2022/06/30 11:18:38 nia Exp $
+# $NetBSD: Makefile,v 1.287 2022/07/04 04:37:53 pgoyette Exp $
 
 VERREL=                7.3.3
 VERRC=         2
@@ -188,7 +188,9 @@ CONFIGURE_ENV+=             TMPDIR=${WRKSRC}/tmp
 CONFIGURE_ENV+=                ANT_LIB=${LOCALBASE}/lib/java/ant
 
 MAKE_JOBS_SAFE=                no # --with-parallelism conficts with -jN
-.if !empty(MAKE_JOBS)
+.if !empty(MAKE_JOBS.${PKGPATH})
+CONFIGURE_ARGS+=       --with-parallelism=${MAKE_JOBS.${PKGPATH}}
+.elif !empty(MAKE_JOBS)
 CONFIGURE_ARGS+=       --with-parallelism=${MAKE_JOBS}
 .else
 CONFIGURE_ARGS+=       --with-parallelism=1