This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

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


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.

  Matthias
libjava/classpath/ChangeLog.gcj

2008-02-08  Matthias Klose  <doko@ubuntu.com>

	* tools/Makefile.am ($(TOOLS_ZIP)): Revert part of previous change,
	Do copy resource files in JAVA_MAINTAINER_MODE only.
	* tools/Makefile.in: Regenerate.
 
Index: libjava/classpath/tools/Makefile.am
===================================================================
--- libjava/classpath/tools/Makefile.am	(revision 132188)
+++ libjava/classpath/tools/Makefile.am	(working copy)
@@ -186,7 +186,6 @@
 	AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \
 	  $$AC -g -w -d $(srcdir)/asm @asm.lst
 	$(JCOMPILER) -g -w -d $(srcdir)/classes @classes.lst @vm-tools.lst
-endif
 ## Copy over tools resource files.
 	@list=`cd $(top_srcdir)/resource && find gnu/classpath/tools \
 	       com/sun/javadoc com/sun/tools/doclets com/sun/tools/javac \
@@ -197,6 +196,7 @@
 	  echo "  cp $(top_srcdir)/resource/$$p classes/$$p"; \
 	  cp $(top_srcdir)/resource/$$p classes/$$p; \
 	done
+endif
 ## Copy over rmic template files.
 	@list=`cd $(srcdir) && find gnu/classpath/tools -name \*.jav -print`; \
 	for p in $$list; do \

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]