Skip to content
Snippets Groups Projects
Forked from redox-os / gcc
Source project has a limited visibility.
  • fitzsim's avatar
    03b8eaad
    2006-05-30 Thomas Fitzsimmons <fitzsim@redhat.com> · 03b8eaad
    fitzsim authored
    	* 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
    03b8eaad
    History
    2006-05-30 Thomas Fitzsimmons <fitzsim@redhat.com>
    fitzsim authored
    	* 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