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. Regards
diff -ur /usr/ports/java/openjdk6/Makefile openjdk6/Makefile
--- /usr/ports/java/openjdk6/Makefile 2010-05-22 03:05:20.000000000 +0200
+++ openjdk6/Makefile 2010-06-25 23:28:24.000000000 +0200
@@ -45,6 +45,7 @@
# java extracts directly to the cwd
WRKSRC= ${WRKDIR}
+MAKE_JOBS_SAFE= yes
USE_GMAKE= yes
USE_MOTIF= yes
@@ -142,8 +143,9 @@
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}
+.endif
COPYDIRS= \
hotspot/src/os/linux/launcher \
@@ -210,6 +212,15 @@
${WRKSRC}/jdk/make/javax/crypto/Makefile
.endif
+do-build:
+ @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; then \
+ if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \
+ ${ECHO_MSG} "===> Compilation failed unexpectedly."; \
+ (${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
+ fi; \
+ ${FALSE}; \
+ fi)
+
.if defined(WITH_TEST)
post-build:
@${ECHO_MSG} ""
signature.asc
Description: This is a digitally signed message part.
