openjdk-7: enable xawt
Hi all
Currently xawt is disabled when building openjdk-7-jre for all architectures. I'd like to reenable this. The attached patch works fine for armv7. My guess is that the patches which disabled xawt were applied because of qemu failing to executed and thus making the whole build fail. I guess that recent changes to the way binaries are built for and executed by qemu in meta-java makes openjdk-7 build again.
This has been done in a first step for the ppc architecture by commit
http://git.yoctoproject.org/cgit/cgit.cgi/meta-java/commit/?id=f03d3e5bbb6a096960a781547884015f50be96da
and then extended to all architectures with:
http://git.yoctoproject.org/cgit/cgit.cgi/meta-java/commit/?id=4e862f09394dccc15d26c6e8768072cf98cb013f
Henning, Koen do you have any comments what additionally needs to be tested from your original work on the patches?
Regards
Max
Max Krummenacher (1):
openjdk-7: enable xawt
.../icedtea-jdk-nio-use-host-cc.patch | 22 ---------------------- 1 file changed, 22 deletions(-)
Signature · 1 line
1.9.3
RFC 1/1 openjdk-7: enable xawt
The build of xawt has been disabled as its build seemed to fail during a qemu call to generate a file with information on variable sizes.
qemu is now called with the relevant path into sysroot and thus works.
This patch enables xawt again.
--- .../icedtea-jdk-nio-use-host-cc.patch | 22 ---------------------- 1 file changed, 22 deletions(-)
recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-nio-use-host-cc.patch +0 -22
@@ -49,25 +49,3 @@ Index: openjdk/jdk/make/java/nio/Makefile -endif .PHONY: sources -Index: openjdk/jdk/make/sun/Makefile -=================================================================== ---- openjdk/jdk/make/sun/Makefile 2013-07-25 09:10:09.000000000 -0700 -+++ openjdk/jdk/make/sun/Makefile 2013-10-01 21:32:01.625839149 -0700 -@@ -55,7 +55,7 @@ - endif - endif - HEADLESS_SUBDIR = headless -- XAWT_SUBDIR = xawt -+ XAWT_SUBDIR = - endif - - ifeq ($(PLATFORM), macosx) -@@ -87,7 +87,7 @@ - endif - SUBDIRS_desktop = audio $(RENDER_SUBDIR) image \ - $(LWAWT_PRE_SUBDIR) $(DISPLAY_LIBS) $(DGA_SUBDIR) $(LWAWT_SUBDIR) \ -- jawt font jpeg cmm $(DISPLAY_TOOLS) beans -+ font jpeg cmm $(DISPLAY_TOOLS) beans - SUBDIRS_management = management - SUBDIRS_misc = $(ORG_SUBDIR) rmi $(JDBC_SUBDIR) tracing - SUBDIRS_tools = native2ascii serialver tools jconsole
Signature · 1 line
1.9.3
Quoted 8 lines · Max Krummenacher
The build of xawt has been disabled as its build seemed to fail during a qemu call to generate a file with information on variable sizes.
qemu is now called with the relevant path into sysroot and thus works.
This patch enables xawt again.
Signed-off-by Max Krummenacher <[email protected]>
I am fine with this change the only remark I may have is force X11 dependency. Would be easy to put this in a PACKAGECONFIG?
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
Am Dienstag, den 17.02.2015, 10:57 -0200 schrieb Otavio Salvador:
Quoted 12 lines · Max Krummenacher
Quoted 8 lines
The build of xawt has been disabled as its build seemed to fail during a qemu call to generate a file with information on variable sizes.
qemu is now called with the relevant path into sysroot and thus works.
This patch enables xawt again.
Signed-off-by Max Krummenacher <[email protected]>I am fine with this change the only remark I may have is force X11 dependency. Would be easy to put this in a PACKAGECONFIG?
I thought about this. As it is not simply a configure option it's not straight forward using the PACKAGECONFIG system.
On second thought one could probably make it a PACKAGECONFIG option, even conditionally set it with DISTRO_FEATURES but then use some python magic to conditionally apply a patch removing xawt if headless is configured.
I'm a bit loaded with work at the moment, so it will take some weeks to come up with a tested v2 of the patch.
Regards
Max
Quoted 4 lines
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
Quoted 17 lines · Max Krummenacher
Am Dienstag, den 17.02.2015, 10:57 -0200 schrieb Otavio Salvador:
Quoted 12 lines · Max Krummenacher
Quoted 8 lines
The build of xawt has been disabled as its build seemed to fail during a qemu call to generate a file with information on variable sizes.
qemu is now called with the relevant path into sysroot and thus works.
This patch enables xawt again.
Signed-off-by Max Krummenacher <[email protected]>I am fine with this change the only remark I may have is force X11 dependency. Would be easy to put this in a PACKAGECONFIG?
I thought about this. As it is not simply a configure option it's not straight forward using the PACKAGECONFIG system.
Quoted 7 lines
On second thought one could probably make it a PACKAGECONFIG option, even conditionally set it with
DISTRO_FEATURESbut then use some python magic to conditionally apply a patch removing xawt if headless is configured.I'm a bit loaded with work at the moment, so it will take some weeks to come up with a tested v2 of the patch.
Yes. You can take a look how we did in meta-fsl-arm for Chromium patches. It has some conditional patching.
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750