This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: classpath build fixlets
- From: Tom Tromey <tromey at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: 03 Oct 2005 16:26:18 -0600
- Subject: Patch: FYI: classpath build fixlets
- Reply-to: tromey at redhat dot com
I'm checking this in.
This changes some classpath libraries to be 'noinst' for the gcj
build. We don't want to install these. This ought to fix the
recently-reported relinking problem.
Tom
Index: ChangeLog.gcj
from Tom Tromey <tromey@redhat.com>
* native/jawt/Makefile.in: Rebuilt.
* native/jawt/Makefile.am (noinst_LTLIBRARIES): Renamed.
* native/jni/xmlj/Makefile.in: Rebuilt.
* native/jni/xmlj/Makefile.am (noinst_LTLIBRARIES): Renamed.
* native/jni/qt-peer/Makefile.in: Rebuilt.
* native/jni/qt-peer/Makefile.am (noinst_LTLIBRARIES): Renamed.
* native/jni/gtk-peer/Makefile.in: Rebuilt.
* native/jni/gtk-peer/Makefile.am (noinst_LTLIBRARIES): Renamed.
Index: native/jawt/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/classpath/native/jawt/Makefile.am,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.am
--- native/jawt/Makefile.am 23 Sep 2005 19:37:10 -0000 1.1.1.1
+++ native/jawt/Makefile.am 3 Oct 2005 22:27:49 -0000
@@ -1,4 +1,5 @@
-pkglib_LTLIBRARIES = libjawtgnu.la
+## GCJ LOCAL: don't install this library
+noinst_LTLIBRARIES = libjawtgnu.la
libjawtgnu_la_SOURCES = jawt.c
libjawtgnu_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la
Index: native/jni/gtk-peer/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/classpath/native/jni/gtk-peer/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- native/jni/gtk-peer/Makefile.am 23 Sep 2005 21:30:58 -0000 1.3
+++ native/jni/gtk-peer/Makefile.am 3 Oct 2005 22:27:50 -0000
@@ -1,4 +1,5 @@
-pkglib_LTLIBRARIES = libgtkpeer.la
+## GCJ LOCAL: don't install this library
+noinst_LTLIBRARIES = libgtkpeer.la
# Gtk/Cairo JNI sources.
if GTK_CAIRO
Index: native/jni/qt-peer/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/classpath/native/jni/qt-peer/Makefile.am,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.am
--- native/jni/qt-peer/Makefile.am 23 Sep 2005 19:37:21 -0000 1.1.1.1
+++ native/jni/qt-peer/Makefile.am 3 Oct 2005 22:27:50 -0000
@@ -1,7 +1,8 @@
# Qt AWT backend for Classpath
#
-pkglib_LTLIBRARIES = libqtpeer.la
+## GCJ LOCAL: don't install this library
+noinst_LTLIBRARIES = libqtpeer.la
AM_LDFLAGS = @CLASSPATH_MODULE@ @QT_LIBS@
AM_CPPFLAGS = @CLASSPATH_INCLUDES@
Index: native/jni/xmlj/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/classpath/native/jni/xmlj/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- native/jni/xmlj/Makefile.am 23 Sep 2005 17:31:11 -0000 1.2
+++ native/jni/xmlj/Makefile.am 3 Oct 2005 22:27:50 -0000
@@ -1,4 +1,5 @@
-pkglib_LTLIBRARIES = libxmlj.la
+## GCJ LOCAL: don't install this library
+noinst_LTLIBRARIES = libxmlj.la
libxmlj_la_SOURCES = \
xmlj_dom.c \