[patch] Patch force jdk-1.4 on amd64

openoffice-java-1.5-amd64.patch (text/plain), 1.01 KB, created by Jon Severinsson on 2006-10-21 07:22:13 UTC

--- /usr/portage/app-office/openoffice/openoffice-2.0.4.ebuild	2006-10-20 09:35:36.000000000 +0200
+++ openoffice-2.0.4.ebuild	2006-10-21 16:01:12.000000000 +0200
@@ -99,7 +99,8 @@
 	!dev-util/dmake
 	>=dev-lang/python-2.3.4
 	>=app-admin/eselect-oodict-20060706
-	java? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
+	java? ( amd64? ( =virtual/jdk-1.4* dev-java/eclipse-ecj )
+		!amd64? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) )
 		dev-java/ant-core )
 	dev-libs/libxslt
 	ldap? ( net-nds/openldap )
@@ -107,6 +108,15 @@
 
 PROVIDE="virtual/ooo"
 
+if use amd64; then
+	# sun-jdk-1.5 is broken on amd64, and has to be disabled. Currently it's
+	# not possible to disable a single implementation, so we disable all 1.5.
+	JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4*"
+	# On my setup javac won't work for some unknown reason.
+	# ecj does just fine. Haven't tried jikes.
+	JAVA_PKG_FORCE_COMPILER="ecj-3.2 ecj-3.1"
+fi
+
 # FIXME executable stacks should be addressed upstream!
 QA_EXECSTACK_x86="usr/lib/openoffice/program/libgcc3_uno.so"