diff options
| author | glewis <glewis@FreeBSD.org> | 2010-09-22 13:18:55 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2010-09-22 13:18:55 +0800 |
| commit | eadb3bf20567ec987de2520242e9015be2eba655 (patch) | |
| tree | 2f2eb543cfcb7249414449f84f09aebfefffac74 /java/jdk15 | |
| parent | c072c5d03e8c958b3a3257e828a315c8f04d88b3 (diff) | |
| download | freebsd-ports-gnome-eadb3bf20567ec987de2520242e9015be2eba655.tar.gz freebsd-ports-gnome-eadb3bf20567ec987de2520242e9015be2eba655.tar.zst freebsd-ports-gnome-eadb3bf20567ec987de2520242e9015be2eba655.zip | |
. Update to tzupdater 1.3.31.
. Respect MAKE_JOB_NUMBERS and use that to set up the number of HotSpot
make jobs. If not, fall back to the number of CPUs.
Only the HotSpot part of the build is safe to parallelise, so mark the
port as MAKE_JOBS_UNSAFE.
Diffstat (limited to 'java/jdk15')
| -rw-r--r-- | java/jdk15/Makefile | 17 | ||||
| -rw-r--r-- | java/jdk15/distinfo | 6 |
2 files changed, 15 insertions, 8 deletions
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index cd1ae558b568..46dd06e44f40 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION}.${JDK_UPDATE_VERSION}p${JDK_PATCHSET_VERSION} -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= # http://download.java.net/tiger/ @@ -42,6 +42,7 @@ SUB_LIST+= JRE_HOME=${PREFIX}/jdk${JDK_VERSION}/jre \ WRKSRC= ${WRKDIR}/control/make USE_ZIP= YES +MAKE_JOBS_UNSAFE= YES JRL_SRCFILE= jdk-${JDK_VERSION:S/./_/g}_${JDK_UPDATE_VERSION}-fcs-src-b${JDK_BUILD_NUMBER}-jrl-${JDK_BUILD_DATE}.jar JRL_BINFILE= jdk-${JDK_VERSION:S/./_/g}_${JDK_UPDATE_VERSION}-fcs-bin-b${JDK_BUILD_NUMBER}-jrl-${JDK_BUILD_DATE}.jar @@ -56,8 +57,8 @@ JDK_BUILD_NUMBER= 02 JDK_BUILD_DATE= 28_may_2008 LATEST_LINK= jdk15 -TZUPDATE_VERSION= 1_3_29 -TZUPDATE_TZVERSION= 2010f +TZUPDATE_VERSION= 1_3_31 +TZUPDATE_TZVERSION= 2010i .include <bsd.port.pre.mk> @@ -141,8 +142,14 @@ MAKE_ENV+= ALT_BOOTDIR="${BOOTSTRAPJDKDIR}" \ .if !defined(WITH_IPV6) MAKE_ENV+= DONT_ENABLE_IPV6="YES" .endif -.if defined(HOTSPOT_BUILD_JOBS) -MAKE_ENV+= HOTSPOT_BUILD_JOBS=${HOTSPOT_BUILD_JOBS} + +.if !defined(DISABLE_MAKE_JOBS) +.if defined(MAKE_JOBS_NUMBER) +BUILD_JOBS_NUMBER= ${MAKE_JOBS_NUMBER} +.else +BUILD_JOBS_NUMBER= `${SYSCTL} -n kern.smp.cpus` +.endif +MAKE_ENV+= HOTSPOT_BUILD_JOBS=${BUILD_JOBS_NUMBER} .endif ALL_TARGET= all diff --git a/java/jdk15/distinfo b/java/jdk15/distinfo index dc42d71337de..e2c1891c003d 100644 --- a/java/jdk15/distinfo +++ b/java/jdk15/distinfo @@ -10,6 +10,6 @@ SIZE (bsd-jdk15-patches-9.tar.bz2) = 802562 MD5 (jce_policy-1_5_0.zip) = 169441bba1ca95e84e030e116f258d79 SHA256 (jce_policy-1_5_0.zip) = 4de78da737c6d66b74eb6caebf6bdb0648825a95e2909e815678a0d306bf6d8b SIZE (jce_policy-1_5_0.zip) = 8826 -MD5 (tzupdater-1_3_29-2010f.zip) = 56c48abd0ebef499c00442701b1492aa -SHA256 (tzupdater-1_3_29-2010f.zip) = 3c625a630c5369fa824ad7b6d7fd4d4747d0977c6ff991651b0fdc3dcf8fc111 -SIZE (tzupdater-1_3_29-2010f.zip) = 492299 +MD5 (tzupdater-1_3_31-2010i.zip) = af9f46b6e08155f2f654417fd063956d +SHA256 (tzupdater-1_3_31-2010i.zip) = 2b7ea6f54aad274e8a6f9e0f82f49f08d5cc44292ab86489b5dcbf80146b9464 +SIZE (tzupdater-1_3_31-2010i.zip) = 264007 |