cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

. Don't cheat on BUILD_DEPENDS in regards to a bootstrap JDK as this

Browse Source 
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.
This commit is contained in:
Greg Lewis 2008-06-25 04:51:30 +00:00
parent 65a85408e3
commit e211b79763
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=215748
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java/jdk15/Makefile
View File

@ -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