2006-05-30 Thomas Fitzsimmons <fitzsim@redhat.com>
* 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 <fitzsim@redhat.com> * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114247 138bc75d-0d04-0410-961f-82ee72b054a4
Showing
- libjava/ChangeLog 21 additions, 0 deletionslibjava/ChangeLog
- libjava/Makefile.am 2 additions, 31 deletionslibjava/Makefile.am
- libjava/Makefile.in 38 additions, 100 deletionslibjava/Makefile.in
- libjava/classpath/ChangeLog.gcj 19 additions, 0 deletionslibjava/classpath/ChangeLog.gcj
- libjava/classpath/Makefile.in 20 additions, 15 deletionslibjava/classpath/Makefile.in
- libjava/classpath/aclocal.m4 120 additions, 312 deletionslibjava/classpath/aclocal.m4
- libjava/classpath/configure 4340 additions, 5072 deletionslibjava/classpath/configure
- libjava/classpath/doc/Makefile.in 20 additions, 15 deletionslibjava/classpath/doc/Makefile.in
- libjava/classpath/doc/api/Makefile.in 4 additions, 11 deletionslibjava/classpath/doc/api/Makefile.in
- libjava/classpath/examples/Makefile.in 4 additions, 11 deletionslibjava/classpath/examples/Makefile.in
- libjava/classpath/external/Makefile.in 20 additions, 15 deletionslibjava/classpath/external/Makefile.in
- libjava/classpath/external/relaxngDatatype/Makefile.in 4 additions, 11 deletionslibjava/classpath/external/relaxngDatatype/Makefile.in
- libjava/classpath/external/sax/Makefile.in 4 additions, 11 deletionslibjava/classpath/external/sax/Makefile.in
- libjava/classpath/external/w3c_dom/Makefile.in 4 additions, 11 deletionslibjava/classpath/external/w3c_dom/Makefile.in
- libjava/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java 1 addition, 4 deletionslibjava/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java
- libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphics.java 2 additions, 4 deletionslibjava/classpath/gnu/java/awt/peer/gtk/GdkGraphics.java
- libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphics2D.java 1 addition, 2 deletionslibjava/classpath/gnu/java/awt/peer/gtk/GdkGraphics2D.java
- libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java 2 additions, 4 deletions...ava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
- libjava/classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java 2 additions, 4 deletionslibjava/classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java
- libjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java 1 addition, 2 deletionslibjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java
Loading
Please register or sign in to comment