For users of --with-openjdk
Dr Andrew John Hughes
ahughes at redhat.com
Thu Aug 12 17:41:37 PDT 2010
On 18:33 Thu 12 Aug , DJ Lucas wrote:
> On 08/11/2010 07:08 PM, DJ Lucas wrote:
>
> >
With regard to your previous e-mail, I think you're right that the sun.awt.Toolkit
fix is insufficent. It was the result of only considering the two existing configurations;
gcj+bootstrap, icedtea+no-bootstrap, with the intent of speeding up the no-bootstrap
case. In the no-bootstrap case, the built rt files aren't used so it was a waste of
time building them. So instead of removing the conditional altogether, I'd go for
changing it to a BOOTSTRAPPING conditional.
Bootstrapping is the default so if you choose to turn it off you should know what
you're doing in making the tradeoff of safety for speed. If your system JDK is
so old it needs some bootstrap classes, then you should be using bootstrap mode.
As I say, it won't use the built classes anyway as it uses the system JDK directly.
I gather you understand the safety issues with disabling it and that's why you want
to do a full build with IcedTea.
> > 1. ERROR in
> > ../../../../src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java
> > (at line 245)
> > ((NimbusLookAndFeel) laf).shouldUpdateStyleOnEvent(event)) {
> > ^^^^^^^^^^^^^^^^^^^^^^^^
> > The method shouldUpdateStyleOnEvent(PropertyChangeEvent) is undefined
> > for the type NimbusLookAndFeel
> >
>
> The correct fix is to include $(SHARE)/javax/swing/plaf in
> ICEDTEA_BOOTSTRAP_DIRS (as I am still using the 1.8.1 nimbus classes in
> this particular case). Again, given the larger target of possible
> system JDKs, I wonder if it would be best to build rt.jar from scratch
> rather than copying from the system version and updating selectively
> (for similar reason to rebuilding tools.jar unconditionally as mentioned
> earlier in this thread).
I've been thinking about this a bit. It's quite a weird one. The failure
is due to a hack needed for backporting Nimbus to JDK6. The SynthLookAndFeel
class has to know about a possible subclass, NimbusLookAndFeel, because we can't
add the needed method to the appropriate interface/superclass, as was done in
7. So the synth look and feel now depends on the nimbus one being built before.
In 1.8.1, you have an older version of NimbusLookAndFeel which is what causes the
complaint. In icedtea-no-bootstrap mode (and straight OpenJDK builds), we fixed
this by building Nimbus first. However, gcj can't generate Nimbus; so in bootstrap
mode, you'll see that we pass DISABLE_NIMBUS=true in the Makefile and the files
are instead compiled from pre-generated versions in the rt.stamp stage.
I'm guessing this doesn't work for the icedtea-bootstrap mode because it doesn't
pull in as many classes to rebuild as gcj does (presumably because Sun classes which
are built when using gcj are found in rt.jar when using IcedTea). Your fix seems
correct, though for IcedTea, removing the DISABLE_NIMBUS line would also work.
I don't think we should rebuild everything for a new rt.jar. Not only would it
take longer, but something would probably fail if core classes like String are
being rebuilt.
Anyway, that minimal change (along with
> rebuilding tools.jar) is enough to get to through the classes with 1.8.1
> (both are covered in the attached patch) but I've no idea if more
> updates are required for 1.7.x or 1.8.0, or even how far back should be
> 'supported'. Keep in mind that this is on the 1.9 branch, but should
> apply to 1.10 as there haven't been that many changes yet. The other
> option is to update tools.jar as is done with rt now, but I see that
> getting to be a nightmare to manage unless you require a minimum version
> of OpenJDK (and Oracle/Sun JDK if intended to be supported).
>
The aim is to support icedtea-bootstrap mode with 1.10. I won't be
backporting such major build changes to older versions (that's why I
waited for 1.9 to fork). You are of course welcome to patch it
locally, and it sounds like you have 1.8 nearly there. It should be a
slightly easier task as you only have to work about icedtea-bootstrap
mode working and not breaking the other two :-) When 1.10 is out, you
can then drop the patches.
The issue below is due to the Xrender update that went into 1.9 last
week before the branch. gjavah produces different output to Oracle's
javah so we have to patch the code to work with it in
patches/ecj/javah.patch. This is currently applied unconditionally
and I need to look at this issue in more detail before we can have a
test in configure to determine whether to patch or not. For now, you
can build 1.9 by dropping ecj/javah.patch from the Makefile.am. The
issue shouldn't occur with 1.8 as it doesn't have the OpenGL changes
or the javah patch.
> My next error is from gcc, and is a known issue:
>
> /usr/bin/gcc -O2 -fno-strict-aliasing -fPIC -W -Wall -Wno-unused
> -Wno-parentheses -fno-omit-frame-pointer -D_LITTLE_ENDIAN -g
> -DARCH='"i586"' -Di586 -DLINUX -DRELEASE='"1.6.0_20"'
> -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT -I.
> -I/home/dj/icedtea6-1-9-7816c6d7a641/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/CClassHeaders
> -I../../../src/solaris/javavm/export -I../../../src/share/javavm/export
> -I../../../src/share/javavm/include
> -I../../../src/solaris/javavm/include -I../../../src/share/native/common
> -I../../../src/solaris/native/common
> -I../../../src/share/native/sun/awt/X11
> -I../../../src/solaris/native/sun/awt/X11 -I/usr/include -DXAWT
> -DXAWT_HACK
> -I/home/dj/icedtea6-1-9-7816c6d7a641/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/../../sun.awt/awt/CClassHeaders
> -I../../../src/solaris/native/sun/awt
> -I../../../src/solaris/native/sun/xawt
> -I../../../src/solaris/native/sun/jdga
> -I../../../src/share/native/sun/awt/debug
> -I../../../src/share/native/sun/awt/image/cvutils
> -I../../../src/share/native/sun/java2d
> -I../../../src/share/native/sun/java2d/loops
> -I../../../src/share/native/sun/awt/image/cvutils
> -I../../../src/share/native/sun/awt/image
> -I../../../src/share/native/sun/font
> -I../../../src/solaris/native/sun/java2d
> -I../../../src/share/native/sun/java2d/pipe
> -I../../../src/share/native/sun/java2d/opengl
> -I../../../src/solaris/native/sun/java2d/opengl
> -I../../../src/solaris/native/sun/java2d/x11
> -I../../../src/share/native/sun/dc/path
> -I../../../src/share/native/sun/dc/doe
> -I../../../src/share/native/sun/awt/alphacomposite
> -I../../../src/share/native/sun/awt/medialib
> -I../../../src/solaris/native/sun/awt/medialib
> -I../../../src/solaris/native/sun/font
> -I../../../src/share/native/sun/awt
> -I../../../src/solaris/native/sun/awt
> -I/usr/X11R6/include/X11/extensions -I/usr/include/X11/extensions
> -I/usr/include -I/usr/X11R6/include -c -o
> /home/dj/icedtea6-1-9-7816c6d7a641/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/obj/OGLContext.o
> ../../../src/share/native/sun/java2d/opengl/OGLContext.c
> ../../../src/share/native/sun/java2d/opengl/OGLContext.c: In function
> ‘OGLContext_GetExtensionInfo’:
> ../../../src/share/native/sun/java2d/opengl/OGLContext.c:872: error:
> ‘sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_TEXRECT’
> undeclared (first use in this function)
> ../../../src/share/native/sun/java2d/opengl/OGLContext.c:872: error:
> (Each undeclared identifier is reported only once
> ../../../src/share/native/sun/java2d/opengl/OGLContext.c:872: error: for
> each function it appears in.)
> ../../../src/share/native/sun/java2d/opengl/OGLContext.c:875: error:
> ‘sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_FBOBJECT’
> undeclared (first use in this function)
> ../../../src/share/native/sun/java2d/opengl/OGLContext.c:878: error:
> ‘sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_LCD_SHADER’
> undeclared (first use in this function)
> ../../../src/share/native/sun/java2d/opengl/OGLContext.c:881: error:
> ‘sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_BIOP_SHADER’
> undeclared (first use in this function)
> ../../../src/share/native/sun/java2d/opengl/OGLContext.c:884: error:
> ‘sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_GRAD_SHADER’
> undeclared (first use in this function)
> /usr/bin/gcc -O2 -fno-strict-aliasing -fPIC -W -Wall -Wno-unused
> -Wno-parentheses -fno-omit-frame-pointer -D_LITTLE_ENDIAN -g
> -DARCH='"i586"' -Di586 -DLINUX -DRELEASE='"1.6.0_20"'
> -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT -I.
> -I/home/dj/icedtea6-1-9-7816c6d7a641/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/CClassHeaders
> -I../../../src/solaris/javavm/export -I../../../src/share/javavm/export
> -I../../../src/share/javavm/include
> -I../../../src/solaris/javavm/include -I../../../src/share/native/common
> -I../../../src/solaris/native/common
> -I../../../src/share/native/sun/awt/X11
> -I../../../src/solaris/native/sun/awt/X11 -I/usr/include -DXAWT
> -DXAWT_HACK
> -I/home/dj/icedtea6-1-9-7816c6d7a641/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/../../sun.awt/awt/CClassHeaders
> -I../../../src/solaris/native/sun/awt
> -I../../../src/solaris/native/sun/xawt
> -I../../../src/solaris/native/sun/jdga
> -I../../../src/share/native/sun/awt/debug
> -I../../../src/share/native/sun/awt/image/cvutils
> -I../../../src/share/native/sun/java2d
> -I../../../src/share/native/sun/java2d/loops
> -I../../../src/share/native/sun/awt/image/cvutils
> -I../../../src/share/native/sun/awt/image
> -I../../../src/share/native/sun/font
> -I../../../src/solaris/native/sun/java2d
> -I../../../src/share/native/sun/java2d/pipe
> -I../../../src/share/native/sun/java2d/opengl
> -I../../../src/solaris/native/sun/java2d/opengl
> -I../../../src/solaris/native/sun/java2d/x11
> -I../../../src/share/native/sun/dc/path
> -I../../../src/share/native/sun/dc/doe
> -I../../../src/share/native/sun/awt/alphacomposite
> -I../../../src/share/native/sun/awt/medialib
> -I../../../src/solaris/native/sun/awt/medialib
> -I../../../src/solaris/native/sun/font
> -I../../../src/share/native/sun/awt
> -I../../../src/solaris/native/sun/awt
> -I/usr/X11R6/include/X11/extensions -I/usr/include/X11/extensions
> -I/usr/include -I/usr/X11R6/include -c -o
> /home/dj/icedtea6-1-9-7816c6d7a641/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/obj/OGLFuncs.o
> ../../../src/share/native/sun/java2d/opengl/OGLFuncs.c
> ../../../src/share/native/sun/java2d/opengl/OGLContext.c: In function
> ‘Java_sun_java2d_opengl_OGLContext_getOGLIdString’:
> ../../../src/share/native/sun/java2d/opengl/OGLContext.c:1051: warning:
> implicit declaration of function ‘jio_snprintf’
> make[6]: ***
> [/home/dj/icedtea6-1-9-7816c6d7a641/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/obj/OGLContext.o]
> Error 1
> make[6]: *** Waiting for unfinished jobs....
> make[6]: Leaving directory
> `/home/dj/icedtea6-1-9-7816c6d7a641/openjdk-ecj/jdk/make/sun/xawt'
> make[5]: *** [library_parallel_compile] Error 2
> make[5]: Leaving directory
> `/home/dj/icedtea6-1-9-7816c6d7a641/openjdk-ecj/jdk/make/sun/xawt'
> make[4]: *** [all] Error 1
> make[4]: Leaving directory
> `/home/dj/icedtea6-1-9-7816c6d7a641/openjdk-ecj/jdk/make/sun'
> make[3]: *** [all] Error 1
> make[3]: Leaving directory
> `/home/dj/icedtea6-1-9-7816c6d7a641/openjdk-ecj/jdk/make'
> make[2]: *** [jdk-build] Error 2
> make[2]: Leaving directory `/home/dj/icedtea6-1-9-7816c6d7a641/openjdk-ecj'
> make[1]: *** [build_product_image] Error 2
> make[1]: Leaving directory `/home/dj/icedtea6-1-9-7816c6d7a641/openjdk-ecj'
> make: *** [stamps/icedtea-ecj.stamp] Error 2
>
> See
> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-October/007339.html
>
> I'll have to wrap the additional hunk in an ifndef (or probably better,
> apply the responsible patch conditionally), but I'll get back to that
> over the weekend (again, if somebody doesn't beat me to it first).
>
> I hope some of my observations are useful.
>
They are. I've been meaning to look at getting this work for a while, and having
someone else looking too is good motivation ;-)
> -- DJ Lucas
>
> --
> This message has been scanned for viruses and
> dangerous content, and is believed to be clean.
>
> diff -Naurp icedtea6-1-9-7816c6d7a641-orig/configure.ac icedtea6-1-9-7816c6d7a641/configure.ac
> --- icedtea6-1-9-7816c6d7a641-orig/configure.ac 2010-08-11 23:01:25.000000000 -0500
> +++ icedtea6-1-9-7816c6d7a641/configure.ac 2010-08-11 23:14:21.000000000 -0500
> @@ -178,7 +178,6 @@ IT_CHECK_ADDITIONAL_VMS
> ENABLE_HG
> AC_CHECK_WITH_HG_REVISION
> AC_CHECK_WITH_TZDATA_DIR
> -IT_CHECK_FOR_CLASS([SUN_AWT_TOOLKIT], [sun.awt.SunToolkit])
> IT_GETDTDTYPE_CHECK
> IT_CHECK_XULRUNNER_VERSION
>
> diff -Naurp icedtea6-1-9-7816c6d7a641-orig/Makefile.am icedtea6-1-9-7816c6d7a641/Makefile.am
> --- icedtea6-1-9-7816c6d7a641-orig/Makefile.am 2010-08-11 23:01:25.000000000 -0500
> +++ icedtea6-1-9-7816c6d7a641/Makefile.am 2010-08-11 23:15:03.000000000 -0500
> @@ -75,6 +76,7 @@ ICEDTEA_BOOTSTRAP_DIRS = \
> $(SHARE)/javax/script \
> $(SHARE)/javax/security/auth/kerberos \
> $(SHARE)/javax/security/sasl \
> + $(SHARE)/javax/swing/plaf/synth \
> $(LANGTOOLS)/com/sun/mirror \
> $(LANGTOOLS)/com/sun/tools/apt
>
> @@ -2066,13 +2068,11 @@ rt-source-files.txt: $(OPENJDK_ECJ_TREE)
> done
>
> stamps/rt-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) rt-source-files.txt
> -if LACKS_SUN_AWT_TOOLKIT
> mkdir -p lib/rt
> $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d lib/rt \
> -sourcepath $(SOURCEPATH_DIRS) -bootclasspath \'\' \
> -classpath $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
> @rt-source-files.txt ;
> -endif
> mkdir -p stamps
> touch stamps/rt-class-files.stamp
>
> @@ -2081,15 +2081,12 @@ clean-rt:
> rm -f stamps/rt-class-files.stamp
> rm -f stamps/rt.stamp
> rm -f rt-source-files.txt
> -if LACKS_SUN_AWT_TOOLKIT
> if [ -e $(ECJ_BOOT_DIR) ] ; then \
> cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(ECJ_BOOT_DIR)/jre/lib/rt.jar ; \
> fi
> -endif
>
> stamps/rt.stamp: stamps/rt-class-files.stamp
> mkdir -p stamps
> -if LACKS_SUN_AWT_TOOLKIT
> $(BOOT_DIR)/bin/jar uf $(RUNTIME) -C lib/rt com -C lib/rt java \
> -C lib/rt javax -C lib/rt sun
> if ENABLE_NIO2
> @@ -2097,7 +2094,6 @@ if ENABLE_NIO2
> $(BOOT_DIR)/bin/jar uf $(RUNTIME) -C lib/rt org/classpath ; \
> fi
> endif
> -endif
> touch stamps/rt.stamp
>
> # Target Aliases
--
Andrew :)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
More information about the distro-pkg-dev
mailing list