On Saturday 26 June 2010 00:15:16 Anonymous wrote:
> David Naylor <naylor.b.da...@gmail.com> writes:
> > On Friday 25 June 2010 18:08:22 David Naylor wrote:
> >> Hi,
> >>
> >> java/openjdk6 breaks with FORCE_MAKE_JOBS (it implements its own think).
> >> The attached patch fixes openjdk6, marks it as MAKE_JOBS_SAFE and makes
> >> it respect MAKE_JOBS_NUMBER.
> >>
> >> Regards,
> >>
> >> David
> >>
> >> P.S. I'm off list
> >
> > Oops. My hack didn't work.
> >
> > With MAKE_JOBS_SAFE _MAKE_JOBS is included but that evaluated to -jN and
> > this is choking the Makefile. Is there an easier way to exclude
> > _MAKE_JOBS? Perhaps set _MAKE_JOBS conditionally in bsd.ports.mk and a
> > port can then do _MAKE_JOBS=""
> > The attached patch fixes the above problem without touching bsd.ports.mk.
>
> You can as well define empty _MAKE_JOBS *after* <bsd.port.post.mk>.
> At least it wouldn't be as ugly as redefining do-build target.
>
> %%
> Index: java/openjdk6/Makefile
> @@ -266,3 +267,6 @@ post-install:
> @${CAT} ${PKGMESSAGE}
>
> .include <bsd.port.post.mk>
> +
> +# XXX: use `?=' in bsd.port.mk
> +_MAKE_JOBS=
> %%Yes, I prefer this approach. See attached for the patch that does this. I will file a PR about this shortly. Regards
diff -ur /usr/ports/java/openjdk6/Makefile openjdk6/Makefile
--- /usr/ports/java/openjdk6/Makefile 2010-07-15 22:29:26.000000000 +0200
+++ openjdk6/Makefile 2010-07-15 22:33:45.000000000 +0200
@@ -48,6 +48,7 @@
# java extracts directly to the cwd
WRKSRC= ${WRKDIR}
+MAKE_JOBS_SAFE= yes
USE_GMAKE= yes
USE_MOTIF= yes
@@ -145,8 +146,10 @@
USE_DISPLAY= yes
.endif
-BUILD_JOBS_NUMBER!= ${SYSCTL} -n kern.smp.cpus
-MAKE_ENV+= HOTSPOT_BUILD_JOBS=${BUILD_JOBS_NUMBER}
+.if !defined(DISABLE_MAKE_JOBS)
+MAKE_ENV+= HOTSPOT_BUILD_JOBS=${MAKE_JOBS_NUMBER}
+# XXX: _MAKE_JOBS=
+.endif
COPYDIRS= \
hotspot/src/os/linux/launcher \
@@ -269,3 +272,5 @@
@${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
+# XXX: use _MAKE_JOBS in bsd.port.mk (and move libe below up-above)
+_MAKE_JOBS=
signature.asc
Description: This is a digitally signed message part.
