This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

FYI: make peer libraries unversioned

From: Thomas Fitzsimmons <fitzsim at redhat dot com>
To: java-patches at gcc dot gnu dot org
Date: Mon, 31 Jul 2006 12:53:27 -0400
Subject: FYI: make peer libraries unversioned

Hi,

I committed this patch, which makes the libraries that are installed in $libdir/gcj-$gcc_version versionless. These libraries are intended to be dlopen'd.

Tested build, install and check on x86_64-unknown-linux-gnu.

Tom

2006-07-31 Thomas Fitzsimmons <fitzsim@redhat.com>

	PR libgcj/28312
	* classpath/native/jni/midi-alsa/Makefile.am
	(libgjsmalsa_la_LDFLAGS): Add -avoid-version.
	* classpath/native/jni/midi-alsa/Makefile.in: Regenerate.
	* classpath/native/jni/midi-dssi/Makefile.am
	(libgjsmdssi_la_LDFLAGS): Add -avoid-version.
	* classpath/native/jni/midi-dssi/Makefile.in: Regenerate.
	* classpath/native/jni/qt-peer/Makefile.am: Remove GCJ LOCAL
	sections.
	(libqtpeer_la_LDFLAGS): Add -avoid-version.
	* classpath/native/jni/qt-peer/Makefile.in: Regenerate.
	* classpath/native/jni/gtk-peer/Makefile.am
	(libgtkpeer_la_LDFLAGS): Add -avoid-version.
	* classpath/native/jni/gtk-peer/Makefile.in: Regenerate.
	* classpath/native/jawt/Makefile.am (libjawt_la_LDFLAGS): Add
	-avoid-version.
	* classpath/native/jawt/Makefile.in: Regenerate.
	* Makefile.am (libjvm_la_LDFLAGS): Add -avoid-version.
	* Makefile.in: Regenerate.

Index: classpath/native/jni/midi-alsa/Makefile.am
===================================================================
--- classpath/native/jni/midi-alsa/Makefile.am	(revision 115801)
+++ classpath/native/jni/midi-alsa/Makefile.am	(working copy)
@@ -5,6 +5,7 @@
 gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider.c
 
 libgjsmalsa_la_LIBADD = -lasound
+libgjsmalsa_la_LDFLAGS = -avoid-version
 
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@ `pkg-config  --cflags-only-I alsa`
Index: classpath/native/jni/midi-dssi/Makefile.am
===================================================================
--- classpath/native/jni/midi-dssi/Makefile.am	(revision 115801)
+++ classpath/native/jni/midi-dssi/Makefile.am	(working copy)
@@ -5,6 +5,7 @@
 			 dssi_data.h
 
 libgjsmdssi_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo -ljack
+libgjsmdssi_la_LDFLAGS = -avoid-version
 
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@ 
Index: classpath/native/jni/qt-peer/Makefile.am
===================================================================
--- classpath/native/jni/qt-peer/Makefile.am	(revision 115801)
+++ classpath/native/jni/qt-peer/Makefile.am	(working copy)
@@ -1,11 +1,7 @@
 # Qt AWT backend for Classpath
 #
 
-## GCJ LOCAL: install this library in GCJ's versioned library
-## directory
-gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER)
-gcjversionedlibdir = $(libdir)/gcj-$(gcc_version)
-gcjversionedlib_LTLIBRARIES = libqtpeer.la
+nativeexeclib_LTLIBRARIES = libqtpeer.la
 
 AM_LDFLAGS = @CLASSPATH_MODULE@ @QT_LIBS@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
@@ -77,9 +73,7 @@
         slotcallbacks.cpp \
         slotcallbacks.h 
 
-## GCJ LOCAL: encode the library path and  use GCJ's library version
-libqtpeer_la_LDFLAGS = -rpath $(gcjversionedlibdir) \
-	-version-info `grep -v '^\#' $(top_srcdir)/../libtool-version`
+libqtpeer_la_LDFLAGS = -avoid-version
 
 BUILT_SOURCES = $(libqtpeer_la_MOC)
 
Index: classpath/native/jni/gtk-peer/Makefile.am
===================================================================
--- classpath/native/jni/gtk-peer/Makefile.am	(revision 115801)
+++ classpath/native/jni/gtk-peer/Makefile.am	(working copy)
@@ -52,6 +52,7 @@
 
 libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \
 		       $(top_builddir)/native/jni/classpath/jcl.lo
+libgtkpeer_la_LDFLAGS = -avoid-version
 
 AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @FREETYPE2_LIBS@ \
              @PANGOFT2_LIBS@ @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ @XTEST_LIBS@
Index: classpath/native/jawt/Makefile.am
===================================================================
--- classpath/native/jawt/Makefile.am	(revision 115801)
+++ classpath/native/jawt/Makefile.am	(working copy)
@@ -2,6 +2,7 @@
 
 libjawt_la_SOURCES = jawt.c
 libjawt_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la
+libjawt_la_LDFLAGS = -avoid-version
 
 AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ @XTEST_LIBS@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
Index: Makefile.am
===================================================================
--- Makefile.am	(revision 115801)
+++ Makefile.am	(working copy)
@@ -247,9 +247,7 @@
 libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec
 ## See jv_convert_LDADD.
 libjvm_la_LIBADD = -L$(here)/.libs libgcj.la
-## The mysterious backslash in the grep pattern is consumed by make.
-libjvm_la_LDFLAGS = \
-        -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
+libjvm_la_LDFLAGS = -avoid-version $(LIBGCJ_LD_SYMBOLIC)
 
 ## The .db file.  This rule is only used for native builds, so it is
 ## safe to invoke gcj-dbtool.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]