libtool upgrade to 2.4.6 - 18/n: SDL customizations

removed os/2 versioning support.
This commit is contained in:
Ozkan Sezer 2021-12-01 01:55:40 +03:00
parent 5ae2f0fd19
commit 3355464079
2 changed files with 9 additions and 7 deletions

14
acinclude/libtool.m4 vendored
View File

@ -2950,15 +2950,17 @@ openbsd* | bitrig*)
os2*) os2*)
libname_spec='$name' libname_spec='$name'
version_type=windows
shrext_cmds=.dll shrext_cmds=.dll
need_version=no
need_lib_prefix=no need_lib_prefix=no
# OS/2 can only load a DLL with a base name of 8 characters or less. # OS/2 can only load a DLL with a base name of 8 characters or less.
soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; # SDL customization: removed versioning support.
v=$($ECHO $release$versuffix | tr -d .-); # version_type=windows
n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); # need_version=no
$ECHO $n$v`$shared_ext' # soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
# v=$($ECHO $release$versuffix | tr -d .-);
# n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
# $ECHO $n$v`$shared_ext'
soname_spec='`test -n "$os2dllname" && libname=$os2dllname; $ECHO $libname | cut -b -8 | tr . _`$shared_ext'
library_names_spec='${libname}_dll.$libext' library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe' dynamic_linker='OS/2 ld.exe'
shlibpath_var=BEGINLIBPATH shlibpath_var=BEGINLIBPATH

View File

@ -8224,7 +8224,7 @@ func_mode_link ()
elif test -n "$soname_spec"; then elif test -n "$soname_spec"; then
# bleh windows # bleh windows
case $host in case $host in
*cygwin* | mingw* | *cegcc* | *os2*) *cygwin* | mingw* | *cegcc*) # | *os2* # SDL customization: removed OS/2 versioning support.
func_arith $current - $age func_arith $current - $age
major=$func_arith_result major=$func_arith_result
versuffix=-$major versuffix=-$major