Re: build failure on powerpc-darwin, GCC trunk revision 132159

[Andrew Haley <aph at redhat dot com>]

Matthias Klose wrote:
> Geoff Keating schrieb:
> > Between revision 132140 and 132159, GCC trunk started failing to
> > bootstrap on powerpc-darwin, with errors building libjava, like:
> >
> > /usr/bin/ld: multiple definitions of symbol java resource
> > sun/rmi/rmic/messages.properties
> > /Users/regress/tbox/native/build/powerpc-apple-darwin8.5.0/libjava/.libs/libgcj.dylib(single
> > module) definition of java resource sun/rmi/rmic/messages.properties
> > ./.libs/libgcj-tools.dylib(single module) definition of java resource
> > sun/rmi/rmic/messages.properties
> >
> > and eventually
> >
> > make[3]: *** [grmic] Error 1
> >
> > This change seems most likely to have caused it:
> >
> > r132156 | doko | 2008-02-06 11:22:53 -0800 (Wed, 06 Feb 2008) | 6 lines
> > Changed paths:
> >    M /trunk/libjava/classpath/ChangeLog.gcj
> >    M /trunk/libjava/classpath/tools/Makefile.am
> >    M /trunk/libjava/classpath/tools/Makefile.in
> >
> > 2008-02-06  Matthias Klose  <doko@ubuntu.com>
> >
> >         * tools/Makefile.am ($(TOOLS_ZIP)): Copy over rmic template files.
> >         Copy resource files independent of JAVA_MAINTAINER_MODE.
> >         * tools/Makefile.in: Regenerate.
>
> The attached patch should fix this, by avoiding the inclusion of the
> *.properties files in the libgcj-tools.jar.
>
> I don't yet understand why these appear twice. in
> libjava/classpath/tools/Makefile.am, only the class files are written into
> all-classes.lst. libjava/Makefile compiles libgcj-tools.jar using
> --filelist=all-classes.lst, so these should not appear there again.

OK, I'm going to approve this.  I realize it doesn't fix the real bug,
but it restores the status quo ante for Darwin.  doko, please commit.
Darwin maintainers, please test.

Andrew.