Commit 3355464079d5afd2c5c598bf959396a68883d85a

Ozkan Sezer 2021-12-01T01:55:40

libtool upgrade to 2.4.6 - 18/n: SDL customizations removed os/2 versioning support.

diff --git a/acinclude/libtool.m4 b/acinclude/libtool.m4
index 4817905..df6496e 100644
--- a/acinclude/libtool.m4
+++ b/acinclude/libtool.m4
@@ -2950,15 +2950,17 @@ openbsd* | bitrig*)
 
 os2*)
   libname_spec='$name'
-  version_type=windows
   shrext_cmds=.dll
-  need_version=no
   need_lib_prefix=no
   # OS/2 can only load a DLL with a base name of 8 characters or less.
-  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'
+# SDL customization: removed versioning support.
+# version_type=windows
+# need_version=no
+# 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'
   dynamic_linker='OS/2 ld.exe'
   shlibpath_var=BEGINLIBPATH
diff --git a/build-scripts/ltmain.sh b/build-scripts/ltmain.sh
index cefb8e3..c10d13d 100644
--- a/build-scripts/ltmain.sh
+++ b/build-scripts/ltmain.sh
@@ -8224,7 +8224,7 @@ func_mode_link ()
 	    elif test -n "$soname_spec"; then
 	      # bleh windows
 	      case $host in
-	      *cygwin* | mingw* | *cegcc* | *os2*)
+	      *cygwin* | mingw* | *cegcc*)  # | *os2* # SDL customization: removed OS/2 versioning support.
 	        func_arith $current - $age
 		major=$func_arith_result
 		versuffix=-$major