From 8c0633b7cd3e6a311ad8b6d5b819e0224fe4d1cd Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Tue, 30 May 2006 21:38:51 +0000 Subject: makemake.tcl (emit_bc_rule): Do not skip gnu-java-awt-peer-gtk.lo. 2006-05-30 Thomas Fitzsimmons * scripts/makemake.tcl (emit_bc_rule): Do not skip gnu-java-awt-peer-gtk.lo. Include gnu/java/awt/peer/gtk Java objects in libgcj.so. Use C++ ABI for gnu/java/awt/peer/gtk package. * gnu/classpath/natSystemProperties.cc (PrependVersionedLibdir): New function. (insertSystemProperties): Only set java.ext.dirs if it is not already defined. Prepend GCJ_VERSIONED_LIBDIR to module search path where necessary. * configure.ac (GTK_AWT): Remove automake conditional. * include/jvm.h (_Jv_PrependVersionedLibdir): New function declaration. * gij.cc (main): Prepend LD_LIBRARY_PATH with GCJ_VERSIONED_LIBDIR and re-exec self. * Makefile.am (AM_CXXFLAGS): Define GCJ_VERSIONED_LIBDIR, GIJ_EXECUTABLE and PATH_SEPARATOR macros. Remove lib-gnu-java-awt-peer-gtk.la and libgcjawt.la build logic. * prims.cc (_Jv_PrependVersionedLibdir): New function. 2006-05-30 Thomas Fitzsimmons * native/jni/gtk-peer/Makefile.am (gcc_version): New variable. (gcjversionedlibdir): Likewise. (libgtkpeer_la_LDFLAGS): Likewise. Install libgtkpeer.so in GCJ versioned library directory. * native/jawt/Makefile.am (gcc_version): New variable. (gcjversionedlibdir): Likewise. (libjawt_la_LDFLAGS): Likewise. Rename libjawtgnu.so libjawt.so. Install libjawt.so in GCJ versioned library directory. * gnu/java/awt/peer/gtk/GdkFontPeer.java (static): Call System.loadLibrary unconditionally. * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java: Likewise. * gnu/java/awt/peer/gtk/GdkGraphics2D.java: Likewise. * gnu/java/awt/peer/gtk/GdkGraphics.java: Likewise. * gnu/java/awt/peer/gtk/GtkToolkit.java: Likewise. * gnu/java/awt/peer/gtk/GdkTextLayout.java: Likewise. From-SVN: r114247 --- libjava/include/Makefile.in | 2 -- libjava/include/jvm.h | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'libjava/include') diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index 07d6d91..fd3613e 100644 --- a/libjava/include/Makefile.in +++ b/libjava/include/Makefile.in @@ -123,8 +123,6 @@ GCSPEC = @GCSPEC@ GCTESTSPEC = @GCTESTSPEC@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ -GTK_AWT_FALSE = @GTK_AWT_FALSE@ -GTK_AWT_TRUE = @GTK_AWT_TRUE@ GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@ GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@ GTK_CFLAGS = @GTK_CFLAGS@ diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h index 2894224..542056a 100644 --- a/libjava/include/jvm.h +++ b/libjava/include/jvm.h @@ -660,4 +660,7 @@ _Jv_IsPhantomClass (jclass c) return c->state == JV_STATE_PHANTOM; } +// A helper function defined in prims.cc. +char* _Jv_PrependVersionedLibdir (char* libpath); + #endif /* __JAVA_JVM_H__ */ -- cgit v1.1