diff options
52 files changed, 6212 insertions, 0 deletions
diff --git a/recipes/cacao/cacaoh-openjdk-native.inc b/recipes/cacao/cacaoh-openjdk-native.inc new file mode 100644 index 0000000000..5070e7e7bc --- /dev/null +++ b/recipes/cacao/cacaoh-openjdk-native.inc @@ -0,0 +1,31 @@ +DESCRIPTION = "Header generator for Cacao JVM - Needed for cross-compilation builds" +HOMEPAGE = "http://www.cacaojvm.org/" +LICENSE = "GPL" + +DEPENDS = "libtool-native zlib-native virtual/javac-native classpath-native icedtea6-native" + +inherit java autotools + +S = "${WORKDIR}/cacao-${PV}" + +inherit autotools native + +EXTRA_OECONF = " \ + --with-java-runtime-library=openjdk \ + --with-java-runtime-library-classes=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/jre/lib/rt.jar \ + --with-jni_md_h=${STAGING_INCDIR}/classpath \ + --with-jni_h=${STAGING_INCDIR}/classpath \ + --with-hpi_md_h=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/include/hpi \ + --with-hpi_h=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/include/hpi \ + " + +do_compile() { + # Compile the header generator only (and what is needed for it). + oe_runmake -C src/toolbox libtoolbox.la + oe_runmake -C src/vmcore libvmcore.la + oe_runmake -C src/cacaoh cacaoh +} + +do_install() { + install -m 0755 src/cacaoh/.libs/cacaoh ${STAGING_BINDIR}/cacaoh-openjdk-${PV} +} diff --git a/recipes/cacao/cacaoh-openjdk-native_0.99.4.bb b/recipes/cacao/cacaoh-openjdk-native_0.99.4.bb new file mode 100644 index 0000000000..27ab6ab006 --- /dev/null +++ b/recipes/cacao/cacaoh-openjdk-native_0.99.4.bb @@ -0,0 +1,8 @@ +require cacaoh-openjdk-native.inc + +PR = "r0" + +SRC_URI[md5sum] = "63220327925ace13756ae334c55a3baa" +SRC_URI[sha256sum] = "1dfc4903dc0172286df4f1740fd0f12749ac81d51c602290b47cbe83d51e1d56" + +SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2" diff --git a/recipes/icedtea/icedtea6-native-1.7.3/build-hacks-native.patch b/recipes/icedtea/icedtea6-native-1.7.3/build-hacks-native.patch new file mode 100644 index 0000000000..9432d03d60 --- /dev/null +++ b/recipes/icedtea/icedtea6-native-1.7.3/build-hacks-native.patch @@ -0,0 +1,15 @@ +Index: icedtea6-1.6.1/Makefile.am +=================================================================== +--- icedtea6-1.6.1.orig/Makefile.am 2009-12-24 11:38:06.582572265 +0100 ++++ icedtea6-1.6.1/Makefile.am 2009-12-24 11:57:27.159578486 +0100 +@@ -265,6 +265,10 @@ + FT2_LIB="$(FREETYPE2_LIBS)" \ + ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \ + HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \ ++ OE_CFLAGS="$(OE_CFLAGS)" \ ++ OE_CPPFLAGS="$(OE_CPPFLAGS)" \ ++ OE_CXXFLAGS="$(OE_CXXFLAGS)" \ ++ OE_LDFLAGS="$(OE_LDFLAGS)" \ + JAVAC="" \ + RHINO_JAR="$(RHINO_JAR)" \ + JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \ diff --git a/recipes/icedtea/icedtea6-native-1.7.3/disable-library-checks.patch b/recipes/icedtea/icedtea6-native-1.7.3/disable-library-checks.patch new file mode 100644 index 0000000000..23b8bedd6b --- /dev/null +++ b/recipes/icedtea/icedtea6-native-1.7.3/disable-library-checks.patch @@ -0,0 +1,141 @@ +Index: icedtea6-1.7/configure.ac +=================================================================== +--- icedtea6-1.7.orig/configure.ac 2010-01-26 04:52:18.000000000 +0100 ++++ icedtea6-1.7/configure.ac 2010-02-08 12:05:51.354556052 +0100 +@@ -205,9 +205,9 @@ + fi + + dnl pkgconfig cannot be used to find these headers and libraries. +-AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[] +- ,[AC_MSG_ERROR("CUPS headers were not found - +- try installing cups-devel.")]) ++#AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[] ++# ,[AC_MSG_ERROR("CUPS headers were not found - ++# try installing cups-devel.")]) + AC_CHECK_HEADERS([X11/X.h],[] + ,[AC_MSG_ERROR("xorg headers were not found - + try installing xorg-x11-proto-devel.")]) +@@ -239,12 +239,12 @@ + AC_SUBST(XT_LIBS) + + dnl Check for libXp headers and libraries. +-PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no]) +-if test "x${XP_FOUND}" = xno +-then +- AC_MSG_ERROR([Could not find Xp - \ +- Try installing libXp-devel.]) +-fi ++#PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no]) ++#if test "x${XP_FOUND}" = xno ++#then ++# AC_MSG_ERROR([Could not find Xp - \ ++# Try installing libXp-devel.]) ++#fi + AC_SUBST(XP_CFLAGS) + AC_SUBST(XP_LIBS) + +@@ -258,16 +258,16 @@ + AC_SUBST(X11_CFLAGS) + AC_SUBST(X11_LIBS) + +-dnl Check for libXinerama headers and libraries. +-PKG_CHECK_MODULES(XINERAMA, xinerama,[XINERAMA_FOUND=yes] +- ,[XINERAMA_FOUND=no]) +-if test "x${XINERAMA_FOUND}" = xno +-then +- AC_MSG_ERROR([Could not find Xinerama - \ +- Try installing libXinerama-devel.]) +-fi +-AC_SUBST(XINERAMA_CFLAGS) +-AC_SUBST(XINERAMA_LIBS) ++#dnl Check for libXinerama headers and libraries. ++#PKG_CHECK_MODULES(XINERAMA, xinerama,[XINERAMA_FOUND=yes] ++# ,[XINERAMA_FOUND=no]) ++#if test "x${XINERAMA_FOUND}" = xno ++#then ++# AC_MSG_ERROR([Could not find Xinerama - \ ++# Try installing libXinerama-devel.]) ++#fi ++#AC_SUBST(XINERAMA_CFLAGS) ++#AC_SUBST(XINERAMA_LIBS) + + if test "x${ENABLE_XRENDER}" = "xyes" + then +@@ -341,26 +341,26 @@ + AC_CONFIG_FILES([tapset/jstack.stp]) + fi + +-dnl Check for libpng headers and libraries. +-PKG_CHECK_MODULES(LIBPNG, libpng,[LIBPNG_FOUND=yes] +- ,[LIBPNG_FOUND=no]) +-if test "x${LIBPNG_FOUND}" = xno +-then +- AC_MSG_ERROR([Could not find libpng - \ +- Try installing libpng-devel.]) +-fi +-AC_SUBST(LIBPNG_CFLAGS) +-AC_SUBST(LIBPNG_LIBS) +- +-dnl Check for libXtst headers and libraries. +-PKG_CHECK_MODULES(XTST, xtst,[XTST_FOUND=yes],[XTST_FOUND=no]) +-if test "x${XTST_FOUND}" = xno +-then +- AC_MSG_ERROR([Could not find Xtst - \ +- Try installing libXtst-devel.]) +-fi +-AC_SUBST(XTST_CFLAGS) +-AC_SUBST(XTST_LIBS) ++#dnl Check for libpng headers and libraries. ++#PKG_CHECK_MODULES(LIBPNG, libpng,[LIBPNG_FOUND=yes] ++# ,[LIBPNG_FOUND=no]) ++#if test "x${LIBPNG_FOUND}" = xno ++#then ++# AC_MSG_ERROR([Could not find libpng - \ ++# Try installing libpng-devel.]) ++#fi ++#AC_SUBST(LIBPNG_CFLAGS) ++#AC_SUBST(LIBPNG_LIBS) ++ ++#dnl Check for libXtst headers and libraries. ++#PKG_CHECK_MODULES(XTST, xtst,[XTST_FOUND=yes],[XTST_FOUND=no]) ++#if test "x${XTST_FOUND}" = xno ++#then ++# AC_MSG_ERROR([Could not find Xtst - \ ++# Try installing libXtst-devel.]) ++#fi ++#AC_SUBST(XTST_CFLAGS) ++#AC_SUBST(XTST_LIBS) + + dnl Check for freetype2 headers and libraries. + PKG_CHECK_MODULES(FREETYPE2, freetype2,[FREETYPE2_FOUND=yes] +@@ -373,18 +373,18 @@ + AC_SUBST(FREETYPE2_CFLAGS) + AC_SUBST(FREETYPE2_LIBS) + +-dnl Check for alsa headers and libraries (only required for Linux). +-if test "x${BUILD_OS_DIR}" = "xlinux" +-then +- PKG_CHECK_MODULES(ALSA, alsa,[ALSA_FOUND=yes],[ALSA_FOUND=no]) +- if test "x${ALSA_FOUND}" = xno +- then +- AC_MSG_ERROR([Could not find alsa - \ +- Try installing alsa-lib-devel.]) +- fi +-AC_SUBST(ALSA_CFLAGS) +-AC_SUBST(ALSA_LIBS) +-fi ++#dnl Check for alsa headers and libraries (only required for Linux). ++#if test "x${BUILD_OS_DIR}" = "xlinux" ++#then ++# PKG_CHECK_MODULES(ALSA, alsa,[ALSA_FOUND=yes],[ALSA_FOUND=no]) ++# if test "x${ALSA_FOUND}" = xno ++# then ++# AC_MSG_ERROR([Could not find alsa - \ ++# Try installing alsa-lib-devel.]) ++# fi ++#AC_SUBST(ALSA_CFLAGS) ++#AC_SUBST(ALSA_LIBS) ++#fi + + if test "x${enable_pulse_java}" = "xyes" + then diff --git a/recipes/icedtea/icedtea6-native-1.7.3/icedtea-ecj-disable-compilation.patch b/recipes/icedtea/icedtea6-native-1.7.3/icedtea-ecj-disable-compilation.patch new file mode 100644 index 0000000000..cd0f68a1bb --- /dev/null +++ b/recipes/icedtea/icedtea6-native-1.7.3/icedtea-ecj-disable-compilation.patch @@ -0,0 +1,513 @@ +Index: openjdk/jdk/make/sun/awt/Makefile +=================================================================== +--- openjdk.orig/jdk/make/sun/awt/Makefile 2009-04-24 09:33:55.000000000 +0200 ++++ openjdk/jdk/make/sun/awt/Makefile 2009-09-29 13:57:14.446815782 +0200 +@@ -180,7 +180,8 @@ + include $(BUILDDIR)/common/Mapfile-vers.gmk + include $(BUILDDIR)/common/Library.gmk + +-build: fontconfigs ++#build: fontconfigs ++build: + + + ifeq ($(PLATFORM), windows) +@@ -535,9 +536,9 @@ + -I$(PLATFORM_SRC)/native/$(PKGDIR) \ + $(EVENT_MODEL) + +-ifeq ($(PLATFORM), linux) +-LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) +-endif ++#ifeq ($(PLATFORM), linux) ++#LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) ++#endif + + LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \ + $(AWT_RUNPATH) +Index: openjdk/jdk/make/javax/sound/jsoundalsa/Makefile +=================================================================== +--- openjdk.orig/jdk/make/javax/sound/jsoundalsa/Makefile 2009-09-29 13:48:34.534565581 +0200 ++++ openjdk/jdk/make/javax/sound/jsoundalsa/Makefile 2009-09-29 13:57:14.446815782 +0200 +@@ -44,34 +44,35 @@ + # Files + # + +-FILES_c = \ +- Utilities.c \ +- $(DAUDIOFILES_c) \ +- $(MIDIFILES_c) \ +- $(PORTFILES_c) ++#FILES_c = \ ++# Utilities.c \ ++# $(DAUDIOFILES_c) \ ++# $(MIDIFILES_c) \ ++# $(PORTFILES_c) + + # platform dependent files +-FILES_c += \ +- PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \ +- PLATFORM_API_LinuxOS_ALSA_PCM.c \ +- PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \ +- PLATFORM_API_LinuxOS_ALSA_MidiIn.c \ +- PLATFORM_API_LinuxOS_ALSA_MidiOut.c \ +- PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \ +- PLATFORM_API_LinuxOS_ALSA_Ports.c +- +-FILES_export = \ +- $(DAUDIOFILES_export) \ +- $(MIDIFILES_export) \ +- $(PORTFILES_export) ++#FILES_c += \ ++# PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \ ++# PLATFORM_API_LinuxOS_ALSA_PCM.c \ ++# PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \ ++# PLATFORM_API_LinuxOS_ALSA_MidiIn.c \ ++# PLATFORM_API_LinuxOS_ALSA_MidiOut.c \ ++# PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \ ++# PLATFORM_API_LinuxOS_ALSA_Ports.c ++ ++FILES_export = ++#FILES_export = \ ++# $(DAUDIOFILES_export) \ ++# $(MIDIFILES_export) \ ++# $(PORTFILES_export) + +-OTHER_LDLIBS += -lasound ++#OTHER_LDLIBS += -lasound + + CPPFLAGS += \ +- -DUSE_DAUDIO=TRUE \ +- -DUSE_PORTS=TRUE \ +- -DUSE_PLATFORM_MIDI_OUT=TRUE \ +- -DUSE_PLATFORM_MIDI_IN=TRUE \ ++ -DUSE_DAUDIO=FALSE \ ++ -DUSE_PORTS=FALSE \ ++ -DUSE_PLATFORM_MIDI_OUT=FALSE \ ++ -DUSE_PLATFORM_MIDI_IN=FALSE \ + -I$(SHARE_SRC)/native/com/sun/media/sound + + # +Index: openjdk/jdk/make/sun/splashscreen/Makefile +=================================================================== +--- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2009-09-29 13:48:33.738565601 +0200 ++++ openjdk/jdk/make/sun/splashscreen/Makefile 2009-09-29 13:57:14.446815782 +0200 +@@ -32,7 +32,8 @@ + # + # Files + # +-include FILES_c.gmk ++#include FILES_c.gmk ++FILES_c = + + FILES_java = \ + java/awt/SplashScreen.java +@@ -62,9 +63,9 @@ + CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE + + ifneq ($(PLATFORM), windows) +- CFLAGS += -DWITH_X11 +- CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions +- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread ++# CFLAGS += -DWITH_X11 ++# CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions ++# OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread + else # PLATFORM + CFLAGS += -DWITH_WIN32 + OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib +@@ -79,7 +80,7 @@ + vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg + vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen + +-CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen ++#CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen + + ifeq ($(PLATFORM), linux) + ifeq ($(ARCH_DATA_MODEL), 64) +Index: openjdk/jdk/make/sun/xawt/Makefile +=================================================================== +--- openjdk.orig/jdk/make/sun/xawt/Makefile 2009-04-24 09:33:56.000000000 +0200 ++++ openjdk/jdk/make/sun/xawt/Makefile 2009-09-29 13:57:14.446815782 +0200 +@@ -41,15 +41,16 @@ + # + # Files + # +-include FILES_c_unix.gmk +-include FILES_export_unix.gmk ++#include FILES_c_unix.gmk ++FILES_c = ++#include FILES_export_unix.gmk + AUTO_FILES_JAVA_DIRS = sun/awt/X11 + AUTO_JAVA_PRUNE = WrapperGenerator.java + + LDFLAGS += -L$(OPENWIN_LIB) + + ifeq ($(PLATFORM), linux) +-LDFLAGS += -lpthread ++#LDFLAGS += -lpthread + dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) + endif + +@@ -86,16 +87,19 @@ + vpath %.c $(PLATFORM_SRC)/native/sun/java2d/opengl + vpath %.c $(PLATFORM_SRC)/native/sun/java2d/x11 + +-OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -ldl \ +- $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi ++#OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -ldl \ ++# $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi + + ifeq ($(PLATFORM), solaris) + CPPFLAGS += -DFUNCPROTO=15 + dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) + endif + +-CPPFLAGS += -I$(CUPS_HEADERS_PATH) ++#CPPFLAGS += -I$(CUPS_HEADERS_PATH) + ++# Normally we would like to patch these includes away but ++# we need them for the successfull compilation of the sizer ++# executables. + CPPFLAGS += -DXAWT -DXAWT_HACK \ + -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders \ + -I$(PLATFORM_SRC)/native/sun/awt \ +@@ -124,10 +128,10 @@ + + ifeq ($(PLATFORM), linux) + # Allows for builds on Debian GNU Linux, X11 is in a different place +- CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ +- -I/usr/include/X11/extensions \ +- -I$(MOTIF_DIR)/include \ +- -I$(OPENWIN_HOME)/include ++# CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ ++# -I/usr/include/X11/extensions \ ++# -I$(MOTIF_DIR)/include \ ++# -I$(OPENWIN_HOME)/include + endif + + ifeq ($(PLATFORM), solaris) +@@ -238,18 +242,20 @@ + $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@))) + + $(SIZES): $(SIZERS) +- @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ +- $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ +- $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ +- $(CHMOD) +w $@;\ +- else \ +- $(ECHO) GENERATING $@; \ +- $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ +- fi +- @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ +- $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ +- $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ +- fi ++ touch $(SIZES) ++# ++# @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ ++# $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ ++# $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ ++# $(CHMOD) +w $@;\ ++# else \ ++# $(ECHO) GENERATING $@; \ ++# $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ ++# fi ++# @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ ++# $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ ++# $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ ++# fi + + $(TEMPDIR)/.gen.wrappers: $(SIZES) $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES) + $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \ +Index: openjdk/jdk/make/sun/jawt/Makefile +=================================================================== +--- openjdk.orig/jdk/make/sun/jawt/Makefile 2009-09-29 13:48:34.186565471 +0200 ++++ openjdk/jdk/make/sun/jawt/Makefile 2009-09-29 13:57:14.446815782 +0200 +@@ -36,7 +36,8 @@ + ifeq ($(PLATFORM), windows) + FILES_cpp = jawt.cpp + else # PLATFORM +-FILES_c = jawt.c ++FILES_c = ++#FILES_c = jawt.c + endif # PLATFORM + + FILES_h = $(INCLUDEDIR)/jawt.h \ +Index: openjdk/jdk/make/sun/jpeg/Makefile +=================================================================== +--- openjdk.orig/jdk/make/sun/jpeg/Makefile 2009-09-29 13:48:33.726565626 +0200 ++++ openjdk/jdk/make/sun/jpeg/Makefile 2009-09-29 13:57:14.446815782 +0200 +@@ -37,7 +37,8 @@ + # + # Files + # +-include FILES_c.gmk ++FILES_c = ++#include FILES_c.gmk + + AUTO_FILES_JAVA_DIRS = sun/awt/image com/sun/imageio/plugins/jpeg + +Index: openjdk/jdk/make/common/shared/Defs-java.gmk +=================================================================== +--- openjdk.orig/jdk/make/common/shared/Defs-java.gmk 2009-09-29 13:48:55.954565215 +0200 ++++ openjdk/jdk/make/common/shared/Defs-java.gmk 2009-09-29 13:57:14.446815782 +0200 +@@ -36,14 +36,14 @@ + # Memory related -J flags that all uses of java tools should use. + # + JAVA_MEM_FLAGS = -Xmx$(MAX_VM_MEMORY)m +-ifneq (,$(filter $(ARCH), ia64 s390)) ++#ifneq (,$(filter $(ARCH), ia64 s390)) + # Special flags for javac on ia64 to work around a VM problem with + # bad code generation during inlining (what version had this problem?): + # Suspect this may not be needed anymore. +- JAVA_MEM_FLAGS += -Xms$(MAX_VM_MEMORY)m -XX:-Inline +-else +- JAVA_MEM_FLAGS += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m +-endif ++# JAVA_MEM_FLAGS += -Xms$(MAX_VM_MEMORY)m -XX:-Inline ++#else ++# JAVA_MEM_FLAGS += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m ++#endif + + # + # All java tools (javac, javah, and javadoc) run faster with certain java +Index: openjdk/jdk/src/share/classes/java/awt/GraphicsEnvironment.java +=================================================================== +--- openjdk.orig/jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2009-04-24 09:34:04.000000000 +0200 ++++ openjdk/jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2009-09-29 13:57:14.450815511 +0200 +@@ -113,7 +113,7 @@ + * @since 1.4 + */ + public static boolean isHeadless() { +- return getHeadlessProperty(); ++ return true; + } + + /** +Index: openjdk/corba/make/common/Defs.gmk +=================================================================== +--- openjdk.orig/corba/make/common/Defs.gmk 2009-04-24 09:30:19.000000000 +0200 ++++ openjdk/corba/make/common/Defs.gmk 2009-09-29 13:57:14.450815511 +0200 +@@ -444,11 +444,11 @@ + # Tool flags + # + ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS) +-CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) +-CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) +-CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \ ++CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(OE_CFLAGS) ++CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) $(OE_CXXFLAGS) ++CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) $(OE_CPPFLAGS) \ + $(DEFINES) $(OPTIONS:%=-D%) +-LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) ++LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) $(OE_LDFLAGS) + LDLIBS = $(OTHER_LDLIBS) $(LDLIBS_$(VARIANT)) $(LDLIBS_COMMON) + LINTFLAGS = $(LINTFLAGS_$(VARIANT)) $(LINTFLAGS_COMMON) \ + $(OTHER_LINTFLAGS) +Index: openjdk/jdk/make/common/Defs.gmk +=================================================================== +--- openjdk.orig/jdk/make/common/Defs.gmk 2009-09-29 13:48:33.590565061 +0200 ++++ openjdk/jdk/make/common/Defs.gmk 2009-09-29 13:57:14.450815511 +0200 +@@ -662,11 +662,11 @@ + # Tool flags + # + ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS) +-CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) +-CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) +-CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \ ++CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(OE_CFLAGS) ++CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) $(OE_CXXFLAGS) ++CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) $(OE_CPPFLAGS) \ + $(DEFINES) $(OPTIONS:%=-D%) +-LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) ++LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) $(OE_LDFLAGS) + LDLIBS = $(OTHER_LDLIBS) $(LDLIBS_$(VARIANT)) $(LDLIBS_COMMON) + LINTFLAGS = $(LINTFLAGS_$(VARIANT)) $(LINTFLAGS_COMMON) \ + $(OTHER_LINTFLAGS) +Index: openjdk/hotspot/make/linux/makefiles/vm.make +=================================================================== +--- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2009-09-29 13:48:34.098565716 +0200 ++++ openjdk/hotspot/make/linux/makefiles/vm.make 2009-09-29 13:57:14.450815511 +0200 +@@ -170,6 +170,7 @@ + LIBS_VM += $(LLVM_LIBS) + endif + ++LFLAGS_VM = $(OE_LDFLAGS) + LINK_VM = $(LINK_LIB.c) + + # rule for building precompiled header +Index: openjdk/jdk/src/solaris/native/sun/awt/CUPSfuncs.c +=================================================================== +--- openjdk.orig/jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2009-04-24 09:34:34.000000000 +0200 ++++ openjdk/jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2009-09-29 13:57:14.450815511 +0200 +@@ -26,8 +26,10 @@ + #include <jni.h> + #include <jni_util.h> + #include <dlfcn.h> ++#if 0 + #include <cups/cups.h> + #include <cups/ppd.h> ++#endif + + //#define CUPS_DEBUG + +@@ -37,6 +39,7 @@ + #define DPRINTF(x, y) + #endif + ++#if 0 + typedef const char* (*fn_cupsServer)(void); + typedef int (*fn_ippPort)(void); + typedef http_t* (*fn_httpConnect)(const char *, int); +@@ -56,7 +59,7 @@ + fn_ppdClose j2d_ppdClose; + fn_ppdFindOption j2d_ppdFindOption; + fn_ppdPageSize j2d_ppdPageSize; +- ++#endif + + /* + * Initialize library functions. +@@ -65,6 +68,7 @@ + JNIEXPORT jboolean JNICALL + Java_sun_print_CUPSPrinter_initIDs(JNIEnv *en |