diff options
| author | glewis <glewis@FreeBSD.org> | 2008-08-25 11:25:31 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2008-08-25 11:25:31 +0800 |
| commit | a48f317a1bd89e76106227bc6a243441df723c38 (patch) | |
| tree | d8574cd468baa2d6bb5c93ae4d5dcdfc320cf918 /java/jdk15 | |
| parent | 3b879bf265526a6d1b7ca830aefc6566e11e7fa7 (diff) | |
| download | freebsd-ports-gnome-a48f317a1bd89e76106227bc6a243441df723c38.tar.gz freebsd-ports-gnome-a48f317a1bd89e76106227bc6a243441df723c38.tar.zst freebsd-ports-gnome-a48f317a1bd89e76106227bc6a243441df723c38.zip | |
. Revert the change to create a build dependency on the bootstrapping JDK
if it already exists. Since the bootstrap JDK can be an already
installed instance of itself this creates a circular dependency which
breaks portmaster and possibly other port management tools.
Diffstat (limited to 'java/jdk15')
| -rw-r--r-- | java/jdk15/Makefile | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index edaf2735708f..e3fa144af660 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/Makefile @@ -62,18 +62,16 @@ TZUPDATE_TZVERSION= 2008c .include <bsd.port.pre.mk> .if !defined(WITH_LINUX_BOOTSTRAP) -NATIVE_BOOTSTRAP_JDKS= \ - ${LOCALBASE}/diablo-jdk1.6.0:${PORTSDIR}/java/diablo-jdk16 \ - ${LOCALBASE}/diablo-jdk1.5.0:${PORTSDIR}/java/diablo-jdk15 \ - ${LOCALBASE}/jdk1.5.0:${PORTSDIR}/java/jdk15 \ - ${LOCALBASE}/jdk1.6.0:${PORTSDIR}/java/jdk16 \ - ${LOCALBASE}/jdk1.4.2:${PORTSDIR}/java/jdk14 +NATIVE_BOOTSTRAP_JDKS= ${LOCALBASE}/diablo-jdk1.6.0 \ + ${LOCALBASE}/diablo-jdk1.5.0 \ + ${LOCALBASE}/jdk1.5.0 \ + ${LOCALBASE}/jdk1.6.0 \ + ${LOCALBASE}/jdk1.4.2 .endif -LINUX_BOOTSTRAP_JDKS= \ - ${LOCALBASE}/linux-sun-jdk1.5.0:${PORTSDIR}/java/linux-sun-jdk15 \ - ${LOCALBASE}/linux-sun-jdk1.6.0:${PORTSDIR}/java/linux-sun-jdk16 \ - ${LOCALBASE}/linux-sun-jdk1.4.2:${PORTSDIR}/java/linux-sun-jdk14 +LINUX_BOOTSTRAP_JDKS= ${LOCALBASE}/linux-sun-jdk1.5.0 \ + ${LOCALBASE}/linux-sun-jdk1.6.0 \ + ${LOCALBASE}/linux-sun-jdk1.4.2 .if defined(WITH_IPV6) CATEGORIES+= ipv6 @@ -92,9 +90,8 @@ EXTRACT_ONLY+= ${TZUPDATEFILE} # do we have valid native jdk installed? .if !defined(WITH_LINUX_BOOTSTRAP) .for CJDK in ${NATIVE_BOOTSTRAP_JDKS} -. if !defined(BOOTSTRAPJDKDIR) && exists(${CJDK:C/:.*$//}/bin/javac) -BOOTSTRAPJDKDIR= ${CJDK:C/:.*$//} -BUILD_DEPENDS+= ${CJDK:C/:.*$//}/bin/javac:${CJDK:C/^[^:]*://} +. if !defined(BOOTSTRAPJDKDIR) && exists(${CJDK}/bin/javac) +BOOTSTRAPJDKDIR= ${CJDK} . endif .endfor .endif @@ -102,9 +99,8 @@ BUILD_DEPENDS+= ${CJDK:C/:.*$//}/bin/javac:${CJDK:C/^[^:]*://} # do we have valid linux jdk installed? .if !defined(BOOTSTRAPJDKDIR) .for CJDK in ${LINUX_BOOTSTRAP_JDKS} -. if !defined(BOOTSTRAPJDKDIR) && exists(${CJDK:C/:.*$//}/bin/javac) -BOOTSTRAPJDKDIR= ${CJDK:C/:.*$//} -BUILD_DEPENDS+= ${CJDK:C/:.*$//}/bin/javac:${CJDK:C/^[^:]*://} +. if !defined(BOOTSTRAPJDKDIR) && exists(${CJDK}/bin/javac) +BOOTSTRAPJDKDIR= ${CJDK} WITH_LINUX_BOOTSTRAP= YES . endif .endfor |