diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2012-10-30 02:15:40 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2012-10-30 02:15:40 +0000 |
| commit | ea24a012f6cc52ae9712c1a88b8227e7274009dd (patch) | |
| tree | 4ab6169e995d6e91bb32ff01ec8171ded8458764 /java/openjdk7 | |
| parent | - Reset maintainer to perl@ (diff) | |
. Remove bootstrap-openjdk as a potential bootstrap. It cannot compile
openjdk7 at the moment. Instead to default to openjdk6 as the bootstrap
if nothing is already installed.
Reported by: olgeni@
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=306656
Diffstat (limited to 'java/openjdk7')
| -rw-r--r-- | java/openjdk7/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile index 4421a36f4fc9..598cf9894496 100644 --- a/java/openjdk7/Makefile +++ b/java/openjdk7/Makefile @@ -107,8 +107,7 @@ MAKE_ENV+= HOTSPOT_BUILD_JOBS=${BUILD_JOBS_NUMBER} .endif BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk7 \ - ${LOCALBASE}/openjdk6 \ - ${LOCALBASE}/bootstrap-openjdk + ${LOCALBASE}/openjdk6 .include <bsd.port.options.mk> @@ -125,8 +124,8 @@ BOOTSTRAPJDKDIR= ${BJDK} # if no valid jdk found, set dependency .if !defined(BOOTSTRAPJDKDIR) -BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk -BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:${PORTSDIR}/java/bootstrap-openjdk +BOOTSTRAPJDKDIR?= ${LOCALBASE}/openjdk6 +BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:${PORTSDIR}/java/openjdk6 .endif post-patch: |