IcedTea6 HEAD building failure on RHEL 5 - related to ecj/icedtea.patch

[Pavel Tisnovsky]

Hi,

I have a problem building IcedTea6 HEAD on my RHEL 5 machines and it seems it's related to following issue:

- patch tool installed on RHEL 5 (its very old version 2.5.4) [see *] does not like patch
  files in which hunks start directly with "+" or "-" directives. It is more happy when
  there are some unchanged lines (probably because it is able to better synchronize what lines to patch)

- patch failed with patch file ecj/icedtea.patch during patching Defs-java.gmk.

- following simple change should make the patch more happy:

 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)

RFC: should I change the patch ecj/icedtea.patch using this ^^^ change?

[*]
~$ patch --version
patch 2.5.4
Copyright 1984-1988 Larry Wall
Copyright 1989-1999 Free Software Foundation, Inc.

Cheers,
Pavel