diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2010-08-01 22:22:44 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2010-08-01 22:22:44 +0000 |
| commit | 83df85589b0cff5d0bd06c8a4d79fcaa3f35a4e8 (patch) | |
| tree | 7041fe9fccfce865437c95ca7d2efc98222b2217 | |
| parent | - Fix architecture recognition [1] (diff) | |
. Mark MAKE_JOBS_SAFE.
. Use MAKE_JOBS_NUMBER as HOTSPOT_BUILD_JOBS.
PR: 148753
Submitted by: David Naylor <naylor.b.david@gmail.com>
Notes
Notes:
svn path=/head/; revision=258608
| -rw-r--r-- | java/openjdk6/Makefile | 8 | ||||
| -rw-r--r-- | java/openjdk7/Makefile | 9 |
2 files changed, 10 insertions, 7 deletions
diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile index 3c50f2874e39..cf6f47569247 100644 --- a/java/openjdk6/Makefile +++ b/java/openjdk6/Makefile @@ -27,7 +27,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} ${ANTFILE} MAINTAINER= java@FreeBSD.org -COMMENT= Sun's java 6 virtual machine release under the GPL v2 +COMMENT= Oracle's Java 6 virtual machine release under the GPL v2 BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip \ @@ -52,6 +52,7 @@ WRKSRC= ${WRKDIR} USE_GMAKE= yes USE_MOTIF= yes USE_XORG= xtst xi xt x11 +MAKE_JOBS_SAFE= yes JAXP_BUILD= b20 JAXPFILE= jdk6-jaxp-${JAXP_BUILD}.zip @@ -145,8 +146,9 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu 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 \ diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile index ef7394cfcff5..edeb0b603f86 100644 --- a/java/openjdk7/Makefile +++ b/java/openjdk7/Makefile @@ -33,9 +33,10 @@ ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin LATEST_LINK= openjdk7 -USE_GMAKE= YES -USE_ICONV= YES +USE_GMAKE= yes +USE_ICONV= yes USE_XORG+= x11 xext xi xrender xt xtst +MAKE_JOBS_SAFE= yes LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ @@ -73,8 +74,8 @@ MAKE_ENV+= LANG="C" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ MILESTONE="fcs" -.if defined(HOTSPOT_BUILD_JOBS) -MAKE_ENV+= HOTSPOT_BUILD_JOBS="${HOTSPOT_BUILD_JOBS}" +.if !defined(DISABLE_MAKE_JOBS) +MAKE_ENV+= HOTSPOT_BUILD_JOBS=${MAKE_JOBS_NUMBER} .endif BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk7 \ |