diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2009-05-22 03:55:34 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2009-05-22 03:55:34 +0000 |
| commit | 03052526825b203ca381eb18deefba0f3554e404 (patch) | |
| tree | c2c4896a65bea685c7196ec20c7366b0709d5356 /java/openjdk6 | |
| parent | - Update to 0.10.6 (diff) | |
. Allow a previously installed version of openjdk6 and jdk16 to also be
used as a bootstrap.
PR: 134440
Submitted by: Jonathan Chen <jonc@chen.org.nz>
Notes
Notes:
svn path=/head/; revision=234373
Diffstat (limited to 'java/openjdk6')
| -rw-r--r-- | java/openjdk6/Makefile | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile index 1c63b79dbb57..7ed0aed6f8ca 100644 --- a/java/openjdk6/Makefile +++ b/java/openjdk6/Makefile @@ -52,10 +52,25 @@ OPENJDK_OSARCH= bsd-${ARCH:S/i386/i586/} ONLY_FOR_ARCHS= amd64 i386 -BOOTSTRAP_JDKS= ${LOCALBASE}/diablo-jdk1.6.0 +BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk6 \ + ${LOCALBASE}/jdk1.6.0 \ + ${LOCALBASE}/diablo-jdk1.6.0 + +# do we have valid native jdk installed? +.for CJDK in ${BOOTSTRAP_JDKS} +. if !defined(BOOTSTRAPJDKDIR) && exists(${CJDK}/bin/javac) +BOOTSTRAPJDKDIR= ${CJDK} +. endif +.endfor + +# if no valid jdk found, set dependency +.if !defined(BOOTSTRAPJDKDIR) +BOOTSTRAPJDKDIR?= ${LOCALBASE}/diablo-jdk1.6.0 +BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:${PORTSDIR}/java/diablo-jdk16 +.endif MAKE_ENV= LANG=C LC_ALL=C \ - ALT_BOOTDIR=${BOOTSTRAP_JDKS} \ + ALT_BOOTDIR=${BOOTSTRAPJDKDIR} \ ALT_FREETYPE_HEADERS_PATH=${LOCALBASE}/include \ ALT_FREETYPE_LIB_PATH=${LOCALBASE}/lib \ ALT_X11_PATH=${LOCALBASE} \ |