mirror of
git://git.savannah.gnu.org/libtool.git
synced 2025-02-11 15:00:08 +08:00
libtool: use a modern library version scheme for freebsd-elf.
* m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER): Adopt downstream patch used by FreeBSD for versioned library filenames. * build-aux/ltmain.in (func_mode_link): Replace conflicting freebsd-elf version_type case branches with a single calculation setting major and versuffix to match downstream FreeBSD. Signed-off-by: Gary V. Vaughan <gary@gnu.org>
This commit is contained in:
parent
0995849d00
commit
bb7cef9d97
@ -6834,13 +6834,13 @@ func_mode_link ()
|
||||
#
|
||||
case $version_type in
|
||||
# correct linux to gnu/linux during the next big refactor
|
||||
darwin|linux|osf|windows|none)
|
||||
darwin|freebsd-elf|linux|osf|windows|none)
|
||||
func_arith $number_major + $number_minor
|
||||
current=$func_arith_result
|
||||
age=$number_minor
|
||||
revision=$number_revision
|
||||
;;
|
||||
freebsd-aout|freebsd-elf|qnx|sunos)
|
||||
freebsd-aout|qnx|sunos)
|
||||
current=$number_major
|
||||
revision=$number_minor
|
||||
age=0
|
||||
@ -6926,8 +6926,9 @@ func_mode_link ()
|
||||
;;
|
||||
|
||||
freebsd-elf)
|
||||
major=.$current
|
||||
versuffix=.$current
|
||||
func_arith $current - $age
|
||||
major=.$func_arith_result
|
||||
versuffix=$major.$age.$revision
|
||||
;;
|
||||
|
||||
irix | nonstopux)
|
||||
|
2
m4/libtool.m4
vendored
2
m4/libtool.m4
vendored
@ -2543,7 +2543,7 @@ freebsd* | dragonfly*)
|
||||
version_type=freebsd-$objformat
|
||||
case $version_type in
|
||||
freebsd-elf*)
|
||||
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
|
||||
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
||||
need_version=no
|
||||
need_lib_prefix=no
|
||||
;;
|
||||
|
Loading…
Reference in New Issue
Block a user