This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: Bootstrapping problem with GTK peer
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Sat, 21 Aug 2004 12:33:24 +0200
- Subject: Patch: Bootstrapping problem with GTK peer
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I just commited the attached patch to trunk. It fixes a bootstrapping
error with the GTK peer.
Michael
2004-08-21 Andreas Tobler <a.tobler@schweiz.ch>
Michael Koch <konqueror@gmx.de>
* Makefile.am (lib_gnu_java_awt_peer_gtk_la_LINK): Added.
* Makefile.in: Regenerated.
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
iD8DBQFBJyT4WSOgCCdjSDsRApktAJ0dHT9U7WjAlv75YHL0N7eX4i7TzACcDGiC
6Z2T/oXx2CBkW3lnl06kWAY=
=aEYi
-----END PGP SIGNATURE-----
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.402
diff -u -r1.402 Makefile.am
--- Makefile.am 19 Aug 2004 18:12:14 -0000 1.402
+++ Makefile.am 21 Aug 2004 10:26:55 -0000
@@ -350,6 +350,7 @@
## The mysterious backslash in the grep pattern is consumed by make.
lib_gnu_java_awt_peer_gtk_la_LDFLAGS = \
-version-info `grep -v '^\#' $(srcdir)/libtool-version`
+lib_gnu_java_awt_peer_gtk_la_LINK = $(LIBLINK)
lib_org_w3c_dom_la_SOURCES = org/w3c/dom/Attr.java \
org/w3c/dom/CDATASection.java \
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.in,v
retrieving revision 1.429
diff -u -r1.429 Makefile.in
--- Makefile.in 20 Aug 2004 15:14:16 -0000 1.429
+++ Makefile.in 21 Aug 2004 10:27:00 -0000
@@ -4252,6 +4252,7 @@
lib_gnu_java_awt_peer_gtk_la_LDFLAGS = \
-version-info `grep -v '^\#' $(srcdir)/libtool-version`
+lib_gnu_java_awt_peer_gtk_la_LINK = $(LIBLINK)
lib_org_w3c_dom_la_SOURCES = org/w3c/dom/Attr.java \
org/w3c/dom/CDATASection.java \
org/w3c/dom/CharacterData.java \
@@ -7083,7 +7084,7 @@
jni/classpath/$(am__dirstamp) \
jni/classpath/$(DEPDIR)/$(am__dirstamp)
lib-gnu-java-awt-peer-gtk.la: $(lib_gnu_java_awt_peer_gtk_la_OBJECTS) $(lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES)
- $(GCJLINK) $(am_lib_gnu_java_awt_peer_gtk_la_rpath) $(lib_gnu_java_awt_peer_gtk_la_LDFLAGS) $(lib_gnu_java_awt_peer_gtk_la_OBJECTS) $(lib_gnu_java_awt_peer_gtk_la_LIBADD) $(LIBS)
+ $(lib_gnu_java_awt_peer_gtk_la_LINK) $(am_lib_gnu_java_awt_peer_gtk_la_rpath) $(lib_gnu_java_awt_peer_gtk_la_LDFLAGS) $(lib_gnu_java_awt_peer_gtk_la_OBJECTS) $(lib_gnu_java_awt_peer_gtk_la_LIBADD) $(LIBS)
org/w3c/dom/$(am__dirstamp):
@$(mkdir_p) org/w3c/dom
@: > org/w3c/dom/$(am__dirstamp)