merge

3 files changed, 47 insertions, 3 deletions

diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index e9cdfd12f..fbb0def7f 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -17,7 +17,7 @@ PKG_DESCR:=		OpenJDK Java VM
 PKG_SECTION:=		lang
 PKG_BUILDDEP:=		alsa-lib xproto jpeg zlib giflib libpng freetype cups
 PKG_BUILDDEP+=		libX11 libXt libXp libXinerama libXrender libXtst
-PKG_DEPENDS:=		zlib libstdcxx libffi
+PKG_DEPENDS:=		zlib libstdcxx libffi libpthread
 PKG_URL:=		http://openjdk.org/
 PKG_SITES:=		http://download.java.net/openjdk/jdk6/promoted/b22/ \
 			http://mirror.netcologne.de/apache.org/xml/xalan-j/binaries/ \
@@ -93,7 +93,7 @@ MAKE_ENV+=		ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
 			TARGET_ALIAS=$(GNU_TARGET_NAME) BUILD_ALIAS=$(GNU_HOST_NAME) HOST_ALIAS=$(GNU_TARGET_NAME)
 
 OPENJDK_NATIVE_ENV+=	ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
-			GCC_HONOUR_COPTS=s \
+			GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(ARCH) \
 			TARGET_ALIAS=$(GNU_TARGET_NAME) BUILD_ALIAS=$(GNU_HOST_NAME) HOST_ALIAS=$(GNU_TARGET_NAME)
 ALL_TARGET:=		icedtea
 
@@ -131,12 +131,26 @@ pre-configure:
 			--with-rmic=$(BOOTSTRAPJDK)/bin/rmic \
 			--with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \
 			--without-rhino ;\
+	mkdir -p $(WRKBUILD)/generated/sun/awt/X11/generator/ ; \
+	cp $(JTOOLS_BUILD_DIR)/icedtea6-1.10/generated/sun/awt/X11/generator/sizes.32 \
+		$(WRKBUILD)/generated/sun/awt/X11/generator/sizes.32 ; \
+	cp $(JTOOLS_BUILD_DIR)/icedtea6-1.10/generated/sun/awt/X11/generator/sizer.32 \
+		$(WRKBUILD)/generated/sun/awt/X11/generator/sizer.32 ; \
+	cp $(JTOOLS_BUILD_DIR)/icedtea6-1.10/generated/sun/awt/X11/generator/sizer.32 \
+		$(WRKBUILD)/openjdk.build/gensrc/sun/awt/X11/generator/sizer.32 ; \
 	$(MAKE) icedtea-ecj
-	# fixup symlinks to bootstrapjdk
+	# fixup symlinks to bootstrap jdk
 	ln -sf $(BOOTSTRAPJDK)/bin/java $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/java
 	ln -sf $(BOOTSTRAPJDK)/bin/javac $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/javac
 	ln -sf $(BOOTSTRAPJDK)/bin/javah $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/javah
 	ln -sf $(BOOTSTRAPJDK)/bin/jar $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/jar
+	cp $(JTOOLS_BUILD_DIR)/icedtea6-1.10/generated/sun/awt/X11/generator/sizes.32 \
+		$(WRKBUILD)/generated/sun/awt/X11/generator/sizes.32
+	cp $(JTOOLS_BUILD_DIR)/icedtea6-1.10/generated/sun/awt/X11/generator/sizer.32 \
+		$(WRKBUILD)/generated/sun/awt/X11/generator/sizer.32
+	mkdir -p $(WRKBUILD)/openjdk.build/gensrc/sun/awt/X11/generator
+	cp $(JTOOLS_BUILD_DIR)/icedtea6-1.10/generated/sun/awt/X11/generator/sizer.32 \
+		$(WRKBUILD)/openjdk.build/gensrc/sun/awt/X11/generator/sizer.32
 
 openjdk-install:
 	$(INSTALL_DIR) $(IDIR_OPENJDK)/usr
diff --git a/package/openjdk/patches/disable-gamma.patch b/package/openjdk/patches/disable-gamma.patch
new file mode 100644
index 000000000..92a80b3be
--- /dev/null
+++ b/package/openjdk/patches/disable-gamma.patch
@@ -0,0 +1,16 @@
+--- w-openjdk-6-1.orig/openjdk-6/hotspot/make/linux/makefiles/buildtree.make	2011-02-28 17:03:13.000000000 +0100
++++ w-openjdk-6-1/openjdk-6/hotspot/make/linux/makefiles/buildtree.make	2011-04-11 12:47:31.000000000 +0200
+@@ -352,12 +352,8 @@
+ 	echo "if [ -z \$$JAVA_HOME ]; then { $(NO_JAVA_HOME_MSG); exit 0; }; fi"; \
+ 	echo "if ! \$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion 2>&1 > /dev/null"; \
+ 	echo "then"; \
+-	echo "  $(WRONG_DATA_MODE_MSG); exit 0;"; \
++	echo "  exit 0;"; \
+ 	echo "fi"; \
+-	echo "rm -f Queens.class"; \
+-	echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \
+-	echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \
+-	echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \
+ 	) > $@
+ 	$(QUIETLY) chmod +x $@
+ 
diff --git a/package/openjdk/patches/disable-sizers.patch b/package/openjdk/patches/disable-sizers.patch
new file mode 100644
index 000000000..b80ee0e69
--- /dev/null
+++ b/package/openjdk/patches/disable-sizers.patch
@@ -0,0 +1,14 @@
+diff -Nur w-openjdk-6.orig//openjdk-6/jdk/make/sun/xawt/Makefile w-openjdk-6/openjdk-6/jdk/make/sun/xawt/Makefile
+--- w-openjdk-6.orig//openjdk-6/jdk/make/sun/xawt/Makefile	2011-02-28 17:06:12.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/make/sun/xawt/Makefile	2011-04-11 19:50:34.000000000 +0200
+@@ -237,7 +237,9 @@
+ 	$(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \
+ 	    $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@)))
+ 
+-$(SIZES): $(SIZERS)
++#$(SIZES): $(SIZERS)
++$(SIZES):
++	@$(prep-target)
+ 	@if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \
+ 	    $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \
+ 	    $(CP) $(PREDEFINED_SIZES_TMPL) $@; \