Author: jajcus Date: Fri Apr 16 16:59:57 2010 GMT Module: packages Tag: HEAD ---- Log message: - workaround for ECJ bug when running multiple threads
---- Files affected: packages/icedtea6: icedtea6.spec (1.40 -> 1.41) , icedtea6-ecj_single_thread.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/icedtea6/icedtea6.spec diff -u packages/icedtea6/icedtea6.spec:1.40 packages/icedtea6/icedtea6.spec:1.41 --- packages/icedtea6/icedtea6.spec:1.40 Fri Apr 16 17:33:23 2010 +++ packages/icedtea6/icedtea6.spec Fri Apr 16 18:59:51 2010 @@ -27,6 +27,7 @@ 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} @@ -349,6 +350,9 @@ %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} . @@ -392,7 +396,7 @@ %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 @@ -816,6 +820,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.41 2010/04/16 16:59:51 jajcus +- workaround for ECJ bug when running multiple threads + Revision 1.40 2010/04/16 15:33:23 jajcus - hack to stop an inatalled dpkg-architecture from breaking the build ================================================================ Index: packages/icedtea6/icedtea6-ecj_single_thread.patch diff -u /dev/null packages/icedtea6/icedtea6-ecj_single_thread.patch:1.1 --- /dev/null Fri Apr 16 18:59:57 2010 +++ packages/icedtea6/icedtea6-ecj_single_thread.patch Fri Apr 16 18:59:51 2010 @@ -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 + classpa...@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 + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedtea6/icedtea6.spec?r1=1.40&r2=1.41&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
