changeset in /hg/icedtea: Merge with IcedTea tip.

[Mark Wielaard]

Hi Andrew,

On Fri, 2008-05-30 at 14:53 +0000, gnu_andrew at member.fsf.org wrote:
> changeset 7975ee6908a5 in /hg/icedtea
> details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7975ee6908a5
> description:
> 	Merge with IcedTea tip.

Sometimes these merges are confusing. I thought I had already merged
this in this changeset:
http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e9fff1dcf5a3
Which strangely is also one of the parents of your changeset.

> diff -r df0892463d09 -r 7975ee6908a5 patches/icedtea-ecj.patch
> --- a/patches/icedtea-ecj.patch	Fri May 30 15:50:34 2008 +0100
> +++ b/patches/icedtea-ecj.patch	Fri May 30 15:52:51 2008 +0100
> @@ -661,15 +661,14 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm
>  @@ -649,10 +649,11 @@
>   $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
>   	$(prep-target)
> - 	$(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
>  -$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
>  +$(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE)

This part is wrong. That SED line should not be removed. It corrupts the
patch file so that it cannot be applied anymore. The following patch
reinstates it:

2008-06-01  Mark Wielaard  <mark at klomp.org>

    * patches/icedtea-ecj.patch: Correct patch by reinstating
    accidentally removed line.

Cheers,

Mark

diff -r f1c821e52996 patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch Fri May 30 11:09:57 2008 -0400
+++ b/patches/icedtea-ecj.patch Sun Jun 01 17:56:34 2008 +0200
@@ -661,6 +661,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm
 @@ -649,10 +649,11 @@
  $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
        $(prep-target)
+       $(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
 -$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
 +$(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE)
        $(prep-target)