FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makemake.tcl (emit_bc_rule): Do not skip gnu-java-awt-peer-gtk.lo.

Browse source 
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.

From-SVN: r114247
This commit is contained in:
Thomas Fitzsimmons 2006-05-30 21:38:51 +00:00 • committed by Thomas Fitzsimmons
parent 99b25753bb
commit 8c0633b7cd
58 changed files with 5194 additions and 6202 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libjava/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java
View file

@ -62,10 +62,7 @@ public class GdkFontPeer extends ClasspathFontPeer
static
{
if (Configuration.INIT_LOAD_LIBRARY)
{
System.loadLibrary("gtkpeer");
}
System.loadLibrary("gtkpeer");
initStaticState ();

6
libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphics.java
View file

@ -56,10 +56,8 @@ public class GdkGraphics extends Graphics
{
static
{
if (Configuration.INIT_LOAD_LIBRARY)
{
System.loadLibrary("gtkpeer");
}
System.loadLibrary("gtkpeer");
initStaticState ();
}

3
libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphics2D.java
View file

@ -104,8 +104,7 @@ public class GdkGraphics2D extends Graphics2D
throw new Error("Graphics2D not implemented. "
+ "Cairo was not found or disabled at configure time");
if (Configuration.INIT_LOAD_LIBRARY)
System.loadLibrary("gtkpeer");
System.loadLibrary("gtkpeer");
initStaticState();
}

6
libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
View file

@ -75,10 +75,8 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder
{
static
{
if (Configuration.INIT_LOAD_LIBRARY)
{
System.loadLibrary("gtkpeer");
}
System.loadLibrary("gtkpeer");
initStaticState ();
}

6
libjava/classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java
View file

@ -70,10 +70,8 @@ public class GdkTextLayout
// native side, plumbing, etc.
static
{
if (Configuration.INIT_LOAD_LIBRARY)
{
System.loadLibrary("gtkpeer");
}
System.loadLibrary("gtkpeer");
initStaticState ();
}
private native void setText(String str);

3
libjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java
View file

@ -107,8 +107,7 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit
static
{
if (Configuration.INIT_LOAD_LIBRARY)
System.loadLibrary("gtkpeer");
System.loadLibrary("gtkpeer");
int portableNativeSync;
String portNatSyncProp =