diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2010-08-07 02:13:40 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2010-08-07 02:13:40 +0000 |
| commit | c000c852c3dea931af4a3a5fb75acb9ce6d1a4a1 (patch) | |
| tree | 0243b1e006fdfda56ad2768e33b37d1ed1577383 /java | |
| parent | Update to the 20100803 snapshot of GCC 4.4.5. (diff) | |
. Back out the previous revision. The port is not MAKE_JOBS_SAFE.
Notes
Notes:
svn path=/head/; revision=258861
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk6/Makefile | 6 | ||||
| -rw-r--r-- | java/openjdk7/Makefile | 9 |
2 files changed, 6 insertions, 9 deletions
diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile index cf6f47569247..1e59f003cec6 100644 --- a/java/openjdk6/Makefile +++ b/java/openjdk6/Makefile @@ -52,7 +52,6 @@ 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 @@ -146,9 +145,8 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu USE_DISPLAY= yes .endif -.if !defined(DISABLE_MAKE_JOBS) -MAKE_ENV+= HOTSPOT_BUILD_JOBS=${MAKE_JOBS_NUMBER} -.endif +BUILD_JOBS_NUMBER!= ${SYSCTL} -n kern.smp.cpus +MAKE_ENV+= HOTSPOT_BUILD_JOBS=${BUILD_JOBS_NUMBER} COPYDIRS= \ hotspot/src/os/linux/launcher \ diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile index edeb0b603f86..ef7394cfcff5 100644 --- a/java/openjdk7/Makefile +++ b/java/openjdk7/Makefile @@ -33,10 +33,9 @@ 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 \ @@ -74,8 +73,8 @@ MAKE_ENV+= LANG="C" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ MILESTONE="fcs" -.if !defined(DISABLE_MAKE_JOBS) -MAKE_ENV+= HOTSPOT_BUILD_JOBS=${MAKE_JOBS_NUMBER} +.if defined(HOTSPOT_BUILD_JOBS) +MAKE_ENV+= HOTSPOT_BUILD_JOBS="${HOTSPOT_BUILD_JOBS}" .endif BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk7 \ |