/hg/icedtea6: Make the patch file patches/ecj/hotspot.patch comp...

[ptisnovs at icedtea.classpath.org]

changeset c7c1cdb3bb3d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c7c1cdb3bb3d
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Fri Aug 17 11:55:53 2012 +0200

	Make the patch file patches/ecj/hotspot.patch compatible with patch tool 2.5.4


diffstat:

 ChangeLog                 |  5 +++++
 patches/ecj/icedtea.patch |  5 ++++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diffs (27 lines):

diff -r b41a73ca64e6 -r c7c1cdb3bb3d ChangeLog
--- a/ChangeLog	Thu Aug 16 01:51:50 2012 +0100
+++ b/ChangeLog	Fri Aug 17 11:55:53 2012 +0200
@@ -1,3 +1,8 @@
+2012-08-17  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* patches/ecj/hotspot.patch:
+	Make this patch file compatible with patch tool 2.5.4
+
 2012-08-16  Andrew John Hughes  <ahughes at redhat.com>
 
 	PR1121: Old installs still suffer from GCC PR41686
diff -r b41a73ca64e6 -r c7c1cdb3bb3d patches/ecj/icedtea.patch
--- a/patches/ecj/icedtea.patch	Thu Aug 16 01:51:50 2012 +0100
+++ b/patches/ecj/icedtea.patch	Fri Aug 17 11:55:53 2012 +0200
@@ -346,7 +346,10 @@
 diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk
 --- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk	2012-01-18 16:50:57.569109033 +0000
 +++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk	2012-01-18 21:43:04.150185964 +0000
-@@ -120,32 +120,14 @@
+@@ -116,35 +116,17 @@
+ CLASS_VERSION = -target $(TARGET_CLASS_VERSION)
+ JAVACFLAGS  += $(CLASS_VERSION)
+ JAVACFLAGS  += -encoding ascii
 -JAVACFLAGS  += -classpath $(BOOTDIR)/lib/tools.jar
 +JAVACFLAGS  += -classpath $(LANGTOOLS_DIST)/lib/classes.jar
  JAVACFLAGS  += $(OTHER_JAVACFLAGS)