[SCM] GNU Libtool branch, master, updated. v2.4.3-41-gbb7cef9

[Gary V. Vaughan]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  bb7cef9d97d6fdb2d8ee5350a82fb39b0ff8513d (commit)
       via  0995849d00a6f6f52a2b940c0e19b1f4a0891e50 (commit)
      from  81ab62f9031f97788065da8d9bf9f581c3c0715f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bb7cef9d97d6fdb2d8ee5350a82fb39b0ff8513d
Author: Tijl Coosemans <address@hidden>
Date:   Fri Nov 28 15:57:07 2014 +0000

    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 <address@hidden>

commit 0995849d00a6f6f52a2b940c0e19b1f4a0891e50
Author: Tijl Coosemans <address@hidden>
Date:   Fri Nov 28 15:51:34 2014 +0000

    libtool: split sco version into its own type.
    
    * m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER): Set version type to
    "sco" for sco based hosts.
    * build-aux/ltmain.in (func_mode_link): Accept new "sco"
    version_type as equivalent to freebsd-elf.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 build-aux/ltmain.in |   14 ++++++++++----
 m4/libtool.m4       |    4 ++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index 85e2809..a72c007 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -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)
@@ -6990,6 +6991,11 @@ func_mode_link ()
          versuffix=.$current
          ;;
 
+       sco)
+         major=.$current
+         versuffix=.$current
+         ;;
+
        sunos)
          major=.$current
          versuffix=.$current.$revision
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 6143541..da22139 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -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
       ;;
@@ -2909,7 +2909,7 @@ sysv4*MP*)
   ;;
 
 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
+  version_type=sco
   need_lib_prefix=no
   need_version=no
   library_names_spec='$libname$release$shared_ext$versuffix 
$libname$release$shared_ext $libname$shared_ext'


hooks/post-receive
-- 
GNU Libtool