On Sunday 10 May 2009 11:17:22 pm Kurt Miller wrote:
> On Saturday 09 May 2009 5:55:09 pm Andrés wrote:
> > On Sat, May 9, 2009 at 3:07 PM, Kurt Miller <k...@intricatesoftware.com>
> > wrote:
> > > On Saturday 02 May 2009 10:15:53 pm Andrés wrote:
> > >> Is it possible? FAQ says one can build 1.5 with Kaffe for native boot
> > >> strapping, but says nothing about 1.6.
> > >
> > > Kaffe currently can't build 1.6. The version we have is just not up
> > > to the task. 1.7 might be able to build 1.6. There are bootstrap
> > > jdk version checks that I think I loosened so that it could work.
> > > I haven't tried it since 1.7 needs 1.6 to bootstrap and using 1.7
> > > to bootstrap 1.6 would be a circular dependency. It could be
> > > done with a PSEUDO_FLAVOR though.
> > >
> >
> > But there's a package for 1.7, so building it wouldn't be neccesary.
>
> That depends on your perspective. :-)
>
> From a bulk build point of view, the current situation is kaffe ->
> 1.5 -> 1.6 -> 1.7. That must be the default build setup until a
> better solution is worked out (I've been working on it - trust me).
>
> Since devel/jdk/1.6 has no packages and users must build it, I
> can see the value in providing an option to use 1.7 to bootstrap
> 1.6.
>
Here's a new version I like better. This will error out if
the user attempts to use jdk17_bootstrap without having
a 1.7 package installed. I added the same check for
native_bootstrap too.
So if a user attempts to use jdk17_bootstrap without the package
installed they will see this:
$ FLAVOR=jdk17_bootstrap make install
===> jdk-1.6.0.03p7 is marked as broken: This flavor requires an
installed 1.7 jdk package.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/jdk/1.6/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 15 Mar 2009 09:25:04 -0000 1.12
+++ Makefile 15 May 2009 01:47:22 -0000
@@ -7,8 +7,8 @@ COMMENT-main= Java2(TM) Standard Editio
COMMENT-jre= Java2(TM) Standard Edition Runtime Environment v${V}
V= 1.6.0.03
PKGNAME= jdk-${V}
-PKGNAME-main= jdk-${V}p6
-PKGNAME-jre= jre-${V}p6
+PKGNAME-main= jdk-${V}p7
+PKGNAME-jre= jre-${V}p7
CATEGORIES= devel/jdk java
@@ -81,7 +81,7 @@ FETCH_MANUALLY+= " ${PATCHSET}"
FETCH_MANUALLY+= "from
http://www.eyesbeyond.com/freebsddom/java/jdk16.html";
FLAVORS= no_web with_ipv6
-PSEUDO_FLAVORS= native_bootstrap
+PSEUDO_FLAVORS= native_bootstrap jdk17_bootstrap
FLAVOR?=
.if !${FLAVOR:L:Mwith_ipv6}
@@ -92,11 +92,24 @@ MAKE_ENV+= DONT_ENABLE_IPV6=YES
EXTRACT_CASES+= *.jar) true ;;
.if ${FLAVOR:L:Mnative_bootstrap}
+INSTALLED!= (pkg_info -e "jdk->=1.6,<1.7" -q && echo yes) || echo no
+.if ${INSTALLED:L} != "yes"
+BROKEN += This flavor requires an installed 1.6 jdk package
+.endif
BUILD_DEPENDS+= :jdk->=1.6,<1.7:devel/jdk/1.6
MAKE_ENV+= ALT_BOOTDIR="${LOCALBASE}/${JDKHOME}"
.else
+.if ${FLAVOR:L:Mjdk17_bootstrap}
+INSTALLED!= (pkg_info -e "jdk->=1.7,<1.8" -q && echo yes) || echo no
+.if ${INSTALLED:L} != "yes"
+BROKEN += This flavor requires an installed 1.7 jdk package
+.endif
+BUILD_DEPENDS+= :jdk->=1.7,<1.8:devel/jdk/1.7
+MAKE_ENV+= ALT_BOOTDIR="${LOCALBASE}/jdk-1.7.0"
+.else
BUILD_DEPENDS+= :jdk->=1.5,<1.6:devel/jdk/1.5
MAKE_ENV+= ALT_BOOTDIR="${LOCALBASE}/jdk-1.5.0"
+.endif
.endif
.if !${FLAVOR:L:Mno_web}
Index: pkg/DESCR-jre
===================================================================
RCS file: /cvs/ports/devel/jdk/1.6/pkg/DESCR-jre,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR-jre
--- pkg/DESCR-jre 18 Nov 2008 01:51:59 -0000 1.2
+++ pkg/DESCR-jre 15 May 2009 01:47:22 -0000
@@ -11,9 +11,11 @@ the Java 2 SDK, Standard Edition.
Flavors:
native_bootstrap
Bootstrap the jdk using a previously built and installed
- devel/jdk/1.6 package. NOTE: if this flavor is used without a
- previously installed devel/jdk/1.6 package, the port will
- just build the jdk with default (devel/jdk/1.5) bootstrap and stop.
+ devel/jdk/1.6 package.
+
+ jdk17_bootstrap
+ Bootstrap the jdk using a previously built and installed
+ devel/jdk/1.7 package.
no_web
The Mozilla plugin and Java Web Start (javaws) are not built.
Index: pkg/DESCR-main
===================================================================
RCS file: /cvs/ports/devel/jdk/1.6/pkg/DESCR-main,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR-main
--- pkg/DESCR-main 18 Nov 2008 01:51:59 -0000 1.2
+++ pkg/DESCR-main 15 May 2009 01:47:22 -0000
@@ -8,9 +8,11 @@ running on the Java platform.
Flavors:
native_bootstrap
Bootstrap the jdk using a previously built and installed
- devel/jdk/1.6 package. NOTE: if this flavor is used without a
- previously installed devel/jdk/1.6 package, the port will
- just build the jdk with default (devel/jdk/1.5) bootstrap and stop.
+ devel/jdk/1.6 package.
+
+ jdk17_bootstrap
+ Bootstrap the jdk using a previously built and installed
+ devel/jdk/1.7 package.
no_web
The Mozilla plugin and Java Web Start (javaws) are not built.
