diff options
| author | Anthony Green <green@redhat.com> | 2005-04-17 06:51:06 +0000 |
|---|---|---|
| committer | Anthony Green <green@gcc.gnu.org> | 2005-04-17 06:51:06 +0000 |
| commit | 7ff2966ed88fff259fb2bb71f812c84d41fef130 (patch) | |
| tree | 158df82fc9de0f6b39e6d65009c806d6cba31013 | |
| parent | b5fae17584617dccc9b199d60b40c1a8420d98a1 (diff) | |
| download | gcc-7ff2966ed88fff259fb2bb71f812c84d41fef130.tar.gz | |
re PR libgcj/20693 (javax-imageio.lo failed to build)
2005-04-16 Anthony Green <green@redhat.com>
* 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.
* Makefile.in: Rebuilt.
From-SVN: r98263
| -rw-r--r-- | libjava/ChangeLog | 8 | ||||
| -rw-r--r-- | libjava/Makefile.am | 10 | ||||
| -rw-r--r-- | libjava/Makefile.in | 10 |
3 files changed, 18 insertions, 10 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 9c9987f9e4b..c6ae69d83d0 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2005-04-16 Anthony Green <green@redhat.com> + + * 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. + * Makefile.in: Rebuilt. + 2005-04-16 Tom Tromey <tromey@redhat.com> * gnu/xml/pipeline/ValidationConsumer.java (Recognizer): Make diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 61bb558c60f..7f151387edc 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -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_files) ## 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_source_files) ## 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` ## ################################################################ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index e7831ac2177..424010cf872 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -23474,27 +23474,27 @@ lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPEND gnu-xml.lo: $(gnu_xml_source_files) $(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` javax-imageio.lo: $(javax_imageio_source_files) $(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` javax-xml.lo: $(javax_xml_source_files) $(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` gnu-java-beans.lo: $(gnu_java_beans_source_files) $(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` gtk-awt-peer.lo: $(gtk_awt_peer_sources) $(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` %.h: %.class $(GCJH) -classpath '' -bootclasspath $(top_builddir) $(basename $<) |