This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
3.3 PATCH: Fix Tru64 UNIX shared library versioning
- From: Rainer Orth <ro at TechFak dot Uni-Bielefeld dot DE>
- To: gcc-patches at gcc dot gnu dot org
- Cc: java-patches at gcc dot gnu dot org
- Date: Mon, 18 Nov 2002 14:30:33 +0100 (MET)
- Subject: 3.3 PATCH: Fix Tru64 UNIX shared library versioning
This patch fixes the Tru64 UNIX shared library versioning problem described
in
http://gcc.gnu.org/ml/gcc/2002-06/msg00636.html
It does so by importing my patch which has been applied to both the libtool
1.4 branch (released with libtool 1.4.3) and mainline.
Bootstrapped without regressions on alpha-dec-osf5.1 and verified that
shared library version numbers are as expected.
Ok for mainline?
Rainer
-----------------------------------------------------------------------------
Rainer Orth, Faculty of Technology, Bielefeld University
Fri Nov 15 17:09:34 2002 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* ltconfig (osf[345]): Append $major to soname_spec.
Reflect this in library_names_spec.
* ltmain.sh (osf): Prefix $major with . for use as extension.
boehm-gc:
* ltconfig (osf[345]): Append $major to soname_spec.
Reflect this in library_names_spec.
* ltmain.sh (osf): Prefix $major with . for use as extension.
Index: ltconfig
===================================================================
RCS file: /cvs/gcc/gcc/ltconfig,v
retrieving revision 1.23
diff -u -p -r1.23 ltconfig
--- ltconfig 14 Aug 2002 02:39:52 -0000 1.23
+++ ltconfig 18 Nov 2002 13:24:51 -0000
@@ -1286,8 +1286,8 @@ os2*)
osf3* | osf4* | osf5*)
version_type=osf
need_version=no
- soname_spec='${libname}${release}.so'
- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
+ soname_spec='${libname}${release}.so$major'
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
Index: ltmain.sh
===================================================================
RCS file: /cvs/gcc/gcc/ltmain.sh,v
retrieving revision 1.20
diff -u -p -r1.20 ltmain.sh
--- ltmain.sh 6 May 2002 21:26:49 -0000 1.20
+++ ltmain.sh 18 Nov 2002 13:24:51 -0000
@@ -2606,7 +2606,7 @@ EOF
;;
osf)
- major=`expr $current - $age`
+ major=.`expr $current - $age`
versuffix=".$current.$age.$revision"
verstring="$current.$age.$revision"
Index: boehm-gc/ltconfig
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/ltconfig,v
retrieving revision 1.1
diff -u -p -r1.1 ltconfig
--- boehm-gc/ltconfig 17 Aug 2001 18:39:16 -0000 1.1
+++ boehm-gc/ltconfig 18 Nov 2002 13:24:52 -0000
@@ -2017,8 +2017,8 @@ os2*)
osf3* | osf4* | osf5*)
version_type=osf
need_version=no
- soname_spec='${libname}${release}.so'
- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
+ soname_spec='${libname}${release}.so$major'
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
shlibpath_var=LD_LIBRARY_PATH
# this will be overridden with pass_all, but let us keep it just in case
deplibs_check_method='file_magic COFF format alpha shared library'
Index: boehm-gc/ltmain.sh
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/ltmain.sh,v
retrieving revision 1.1
diff -u -p -r1.1 ltmain.sh
--- boehm-gc/ltmain.sh 17 Aug 2001 18:39:16 -0000 1.1
+++ boehm-gc/ltmain.sh 18 Nov 2002 13:24:52 -0000
@@ -1715,7 +1715,7 @@ compiler."
;;
osf)
- major=`expr $current - $age`
+ major=.`expr $current - $age`
versuffix=".$current.$age.$revision"
verstring="$current.$age.$revision"