/hg/release/icedtea6-1.11: Fixed build with GCC 4.7

[Andrew Hughes]

----- Original Message -----
> On 01/30/2012 10:08 PM, Deepak Bhole wrote:
> > * Omair Majid<omajid at redhat.com>  [2012-01-30 22:05]:
> >> On 01/30/2012 06:32 PM, dbhole at icedtea.classpath.org wrote:
> >>> diff -r 308265f39f56 -r 01cc2ea64fbd Makefile.am
> >>> --- a/Makefile.am	Fri Jan 27 11:09:28 2012 -0500
> >>> +++ b/Makefile.am	Mon Jan 30 18:26:19 2012 -0500
> >>> @@ -404,7 +404,10 @@
> >>>   	patches/openjdk/7102369-7094468-rmiregistry.patch \
> >>>   	patches/openjdk/6851973-kerberos.patch \
> >>>   	patches/openjdk/7091528-javadoc_class_files.patch \
> >>> -	patches/openjdk/7103725-ssl_beast_regression.patch
> >>> +	patches/openjdk/7103725-ssl_beast_regression.patch \
> >>> +
> >>> 	patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch
> >>> \
> >>> +
> >>> 	patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch
> >>> \
> >>> +	patches/openjdk/remove-mimpure-option-to-gcc.patch
> >>
> >> The patch:
> >> patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch
> >> is not present in 1.11 (the patch is present in HEAD) and was not
> >> added in this changeset. It also breaks the build :(
> >>
> >> I will remove it before I release.
> >>
> >
> > Gah. Sorry, I only built/tested HEAD and exported/imported to 1.11.
> > I
> > must have accidentally copied an extra line. Sorry about that Omair
> > :(
> 
> Not a big deal. I was rather surprised that this wasn't caught by the
> buildbots, though. As it turns out, however, none of the buildbots
> are
> testing any release branches. They all seem to be testing just
> HEAD/trunk :(
> 

More worrying to me is this implies that the branch wasn't built with the
patch prior to commit.

> Cheers,
> Omair
> 

-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07