[Pkg-gnupg-commit] [libassuan] 398/437: Add hack to have different names for 64 bit Windows DLLs.

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libassuan.

commit f88eb9e98f491b503f46c7d995c9651f1e46b9e9
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Jun 17 16:11:23 2013 +0200

    Add hack to have different names for 64 bit Windows DLLs.
    
    * ltmain.sh: Prefix the SO number for W64 with a "6".
    --
    
    We need to stick to libtool 2.4.2 anyway, thus we take the easy way
    and hack libtool instead of adding "-release 6" to the Makefile.  This
    also avoids an extra dash before the 6 and thus yields a prettier name
    than the one produced by the -release option.  The header files and
    def files are supposed to be identical for w32 and w64 thus we don't
    need to do any special code for them.
    
    Having a different namespace for 64 bit DLLs is such a good idea that
    I hope this or a similar feature will be provided by future libtool
    versions.
---
 ltmain.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/ltmain.sh b/ltmain.sh
index 6f650ae..d47c0ba 100755
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -6748,6 +6748,11 @@ func_mode_link ()
 	    elif test -n "$soname_spec"; then
 	      # bleh windows
 	      case $host in
+              x86_64-*mingw32*)
+                func_arith $current - $age
+		major=$func_arith_result
+		versuffix="6-$major"
+		;;
 	      *cygwin* | mingw* | *cegcc*)
 	        func_arith $current - $age
 		major=$func_arith_result
@@ -7480,6 +7485,14 @@ func_mode_link ()
 	  func_arith $current - $age
 	  major=$func_arith_result
 	  versuffix="-$major"
+          case $host in
+          x86_64-*mingw32*)
+             versuffix="6-$major"
+             ;;
+          *)
+             versuffix="-$major"
+             ;;
+          esac
 	  ;;
 
 	*)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libassuan.git