[packages/icedtea7: 48/103] - workaround for ECJ bug when running multiple threads

[jajcus]

commit 3c17b35dc1ee6dba5332609a4f9933846d32cc45
Author: Jacek Konieczny <jajcus at pld-linux.org>
Date:   Fri Apr 16 16:59:51 2010 +0000

    - workaround for ECJ bug when running multiple threads
    
    Changed files:
        icedtea6-ecj_single_thread.patch -> 1.1
        icedtea6.spec -> 1.41

 icedtea6-ecj_single_thread.patch | 10 ++++++++++
 icedtea6.spec                    |  6 +++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/icedtea6.spec b/icedtea6.spec
index 6d9a822..c8cd509 100644
--- a/icedtea6.spec
+++ b/icedtea6.spec
@@ -26,6 +26,7 @@ Source3:	http://kenai.com/projects/jdk6-drops/downloads/download/jdk6-jaf-2009_1
 Source4:	https://jaxp.dev.java.net/files/documents/913/147329/jdk6-jaxp-2009_10_13.zip
 # Source4-md5:	a2f7b972124cd776ff71e7754eb9a429
 Patch0:		%{name}-i486.patch
+Patch1:		%{name}-ecj_single_thread.patch
 URL:		http://icedtea.classpath.org/wiki/Main_Page
 BuildRequires:	alsa-lib-devel
 %{!?with_bootstrap:BuildRequires:	ant-nodeps}
@@ -348,6 +349,9 @@ Wtyczka z obsługą Javy dla przeglądarek WWW.
 %setup -q
 %patch0 -p1
 
+# workaround for an ECJ bug
+%patch1 -p1
+
 # let the build system extract the sources where it wants them
 mkdir drops
 ln -s %{SOURCE1} .
@@ -391,7 +395,7 @@ export PATH="$JAVA_HOME/bin:$PATH"
 %endif
 # if dpkg-architecure is installed (like on carme) it will break the build
 # unless we disable using it somehow. As patching is difficult here:
-sed -i -e's/dpkg-architecture/dpkg-architecture__/' openjdk*/jdk/make/common/shared/Platform.gmk
+sed -i -e's/dpkg-architecture/dpkg-architecture__/' openjdk*/*/make/common/shared/Platform.gmk
 
 %{__make} -j1 \
 	PRINTF=/bin/printf
diff --git a/icedtea6-ecj_single_thread.patch b/icedtea6-ecj_single_thread.patch
new file mode 100644
index 0000000..368c707
--- /dev/null
+++ b/icedtea6-ecj_single_thread.patch
@@ -0,0 +1,10 @@
+--- icedtea6-1.8/javac.in.orig	2010-03-25 15:10:41.000000000 +0100
++++ icedtea6-1.8/javac.in	2010-04-16 18:23:37.258022591 +0200
+@@ -36,6 +36,6 @@
+     @ECJ@ -1.5 -nowarn $bcoption $NEW_ARGS
+ else
+     CLASSPATH=@ECJ_JAR@${CLASSPATH:+:}$CLASSPATH \
+-     @JAVA@ org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $bcoption $NEW_ARGS
++     @JAVA@ -Djdt.compiler.useSingleThread=true org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $bcoption $NEW_ARGS
+ fi
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/icedtea7.git/commitdiff/f360048b2271851d733c2fc755b8e7cae2f337cf