This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[4.0] Patch: build fix
- From: Anthony Green <green at redhat dot com>
- To: Mark Mitchell <mark at codesourcery dot com>, java-patches at gcc dot gnu dot org
- Date: Sat, 16 Apr 2005 20:42:32 -0700
- Subject: [4.0] Patch: build fix
- Organization: Red Hat, Inc.
HJ identified an intermittent libgcj build problem that HJ identified
here:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20693
We recently discovered that the Fedora gcc rawhide RPMS are being mis-
built because of this problem:
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=155119
My understanding is that HJ's patch has been rejected for 4.0.
Here's a much less intrusive work-around that is simple and will do the
trick for 4.0. We just need to sort the output from "find" so no inner
classes appear as the last file.
Ok for 4.0 branch? (presumably libtool will be fixed on HEAD).
AG
2005-04-16 Anthony Green <green@localhost.localdomain>
* Makefile.am (gnu-xml.lo, javax-imageio.lo, javax-xml.lo,
gnu-java-beans.lo, gtk-awt-peer.lo) : Sort the output of all
"find" output in order to work around the libtool bug described in
PR libgcj/20693.
Index: libjava/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.455.2.11
diff -u -p -r1.455.2.11 Makefile.am
--- libjava/Makefile.am 15 Apr 2005 18:52:47 -0000 1.455.2.11
+++ libjava/Makefile.am 17 Apr 2005 03:31:27 -0000
@@ -667,7 +667,7 @@ gnu-xml.lo: $(gnu_xml_source_files)
## touched.
$(MAKE) classes.stamp
$(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-xml.lo \
- `find gnu/xml -name '*.class' -print`
+ `find gnu/xml -name '*.class' -print | sort -r`
## Depend on the sources, even though we are going to compile the
## classes.
@@ -678,7 +678,7 @@ javax-imageio.lo: $(javax_imageio_source
## touched.
$(MAKE) classes.stamp
$(LTGCJCOMPILE) -findirect-dispatch -c -o javax-imageio.lo \
- `find javax/imageio -name '*.class' -print`
+ `find javax/imageio -name '*.class' -print | sort -r`
## Depend on the sources, even though we are going to compile the
## classes.
@@ -689,7 +689,7 @@ javax-xml.lo: $(javax_xml_source_files)
## touched.
$(MAKE) classes.stamp
$(LTGCJCOMPILE) -findirect-dispatch -c -o javax-xml.lo \
- `find javax/xml -name '*.class' -print`
+ `find javax/xml -name '*.class' -print | sort -r`
## Depend on the sources, even though we are going to compile the
## classes.
@@ -700,7 +700,7 @@ gnu-java-beans.lo: $(gnu_java_beans_sour
## touched.
$(MAKE) classes.stamp
$(LTGCJCOMPILE) -findirect-dispatch -c -o gnu-java-beans.lo \
- `find gnu/java/beans -name '*.class' -print`
+ `find gnu/java/beans -name '*.class' -print | sort -r`
## Depend on the sources, even though we are going to compile the
## classes.
@@ -711,7 +711,7 @@ gtk-awt-peer.lo: $(gtk_awt_peer_sources)
## touched.
$(MAKE) classes.stamp
$(LTGCJCOMPILE) -findirect-dispatch -fjni -c -o gtk-awt-peer.lo \
- `find gnu/java/awt/peer/gtk -name '*.class' -print`
+ `find gnu/java/awt/peer/gtk -name '*.class' -print | sort -r`
## ################################################################