Re: [PATCH] Adjust naming of MSVC import libraries.

[Peter Rosin]

Den 2010-09-04 16:21 skrev Charles Wilson:
> On 9/4/2010 4:52 AM, Peter Rosin wrote:
>> And the testsuite runs have finished and results are the same. I still
>> want to push this.
> 
> I have no objections anymore, but I can't approve it.

Here's a rebased and adjusted version now that 5/7 from the other thread
has gone in and finalized the interface. The testsuite is still happy...

Ok to push? (or are you all on the 72 hour clock since the first post?
I'm setting a new 72 hour clock now in case you're not)

Cheers,
Peter

(BTW, what's up with the strange date generated by git in the next line?)

>From baa6de02d18f99e65777dd8092e6a7fc1d734358 Mon Sep 17 00:00:00 2001
From: Peter Rosin <address@hidden>
Date: Tue, 7 Sep 2010 08:54:50 +0200
Subject: [PATCH] Adjust naming of MSVC import libraries.

* libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [mingw, cygwin]
[pw32, cegcc] <cl*, library_names_spec>: Adjust naming of the
import library from foo-<major-version>.lib to foo.dll.lib, to
avoid clashes with the static library for unversioned libraries.
(_LT_LINKER_SHLIBS, _LT_LANG_CXX_CONFIG) [mingw, cygwin, pw32]
[cegcc] <cl*, archive_expsym_cmds>: Explicitely name the import
library to match the above.

Signed-off-by: Peter Rosin <address@hidden>
---
 ChangeLog             |   11 +++++++++++
 libltdl/m4/libtool.m4 |    6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 65d0a8b..d201a37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2010-09-07  Peter Rosin  <address@hidden>
 
+       Adjust naming of MSVC import libraries.
+       * libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [mingw, cygwin]
+       [pw32, cegcc] <cl*, library_names_spec>: Adjust naming of the
+       import library from foo-<major-version>.lib to foo.dll.lib, to
+       avoid clashes with the static library for unversioned libraries.
+       (_LT_LINKER_SHLIBS, _LT_LANG_CXX_CONFIG) [mingw, cygwin, pw32]
+       [cegcc] <cl*, archive_expsym_cmds>: Explicitely name the import
+       library to match the above.
+
+2010-09-07  Peter Rosin  <address@hidden>
+
        Fixup texi typo in previous.
        * doc/libtool.texi (libtool script content) <postlink_cmds>:
        Add missing 'code' command.
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index ba48ce3..7996c34 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -2312,7 +2312,7 @@ m4_if([$1], [],[
     # Native MSVC
     libname_spec='$name'
     soname_spec='${libname}`echo ${release} | $SED -e 
's/[[.]]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}`echo ${release} | $SED -e 
's/[[.]]/-/g'`${versuffix}.lib'
+    library_names_spec='${libname}.dll.lib'
     sys_lib_search_path_spec="$LIB"
     if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; 
then
       # It is most probably a Windows format PATH.
@@ -5004,7 +5004,7 @@ _LT_EOF
          else
            sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < 
$export_symbols > $output_objdir/$soname.exp;
          fi~
-         $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs 
"@$tool_output_objdir$soname.exp" -Wl,-DLL~
+         $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs 
"@$tool_output_objdir$soname.exp" 
-Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
          linknames='
        # The linker will not automatically build a static lib if we build a 
DLL.
        # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
@@ -6003,7 +6003,7 @@ if test "$_lt_caught_CXX_error" != yes; then
            else
              $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < 
$export_symbols > $output_objdir/$soname.exp;
            fi~
-           $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs 
"@$tool_output_objdir$soname.exp" -Wl,-DLL~
+           $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs 
"@$tool_output_objdir$soname.exp" 
-Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
            linknames='
          # The linker will not automatically build a static lib if we build a 
DLL.
          # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-- 
1.7.1