diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2008-06-25 04:51:30 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2008-06-25 04:51:30 +0000 |
| commit | e211b79763e975a4acd7ea9c8fa0e22381b33aa8 (patch) | |
| tree | 9cda80a27a5cd5ec80d80bdca47e38d395a7221b | |
| parent | Add a fix to prevent a segfault when an mp3 file is followed by a (diff) | |
. Don't cheat on BUILD_DEPENDS in regards to a bootstrap JDK as this
confuses portmaster, which (understandably) expects that we didn't
fake up our bootstrap dependency.
Instead, only set up a BUILD_DEPENDS for a bootstrap if there isn't one
installed. A more complicated and arguably more correct patch would
always set up the BUILD_DEPENDS for the bootstrap JDK but would do so
correctly based on what it found to use.
This almost certainly needs to happen to the other jdk* ports, but I'm
going to await some positive feedback before doing so.
Notes
Notes:
svn path=/head/; revision=215748
| -rw-r--r-- | java/jdk15/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index 0eda0c7bdebe..b7497c52ad5e 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/Makefile @@ -106,12 +106,11 @@ WITH_LINUX_BOOTSTRAP= YES .endif # if no valid jdk found, set dependency -.if !defined(BOOTSTRAPJDKDIR) -BOOTSTRAPJDKDIR?= ${LOCALBASE}/diablo-jdk1.5.0 +.if !defined(BOOTSTRAPJDKDIR) || !exists(${BOOTSTRAPJDKDIR}/bin/javac) +BOOTSTRAPJDKDIR= ${LOCALBASE}/diablo-jdk1.5.0 +BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:${PORTSDIR}/java/diablo-jdk15 .endif -BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:${PORTSDIR}/java/diablo-jdk15 - .if defined(WITHOUT_WEB) MAKE_ENV+= DONT_BUILD_DEPLOY="YES" .else |