[git] GPG-ERROR - branch, w64-work, created. libgpg-error-1.11-6-gca46b9a

[by Werner Koch]

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 "Error codes used by GnuPG et al.".

The branch, w64-work has been created
        at  ca46b9a7bccb2eab085fc45722ffca1210f48223 (commit)

- Log -----------------------------------------------------------------
commit ca46b9a7bccb2eab085fc45722ffca1210f48223
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.

diff --git a/ltmain.sh b/ltmain.sh
index 24e3fd3..07bf696 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -6766,6 +6766,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
@@ -7499,6 +7504,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
 	  ;;
 
 	*)

commit 1ca9b0dec0bfee560ce43d9dac6a26557ebe67a1
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Jun 17 16:01:19 2013 +0200

    Support building for w64.

diff --git a/autogen.sh b/autogen.sh
index 97a3ccc..8256fd2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -40,12 +40,15 @@ w32_toolprefixes=
 w32_extraoptions=
 w32ce_toolprefixes=
 w32ce_extraoptions=
+w64_toolprefixes=
+w64_extraoptions=
 amd64_toolprefixes=
 # End list of optional variables sourced from ~/.gnupg-autogen.rc
 # What follows are variables which are sourced but default to
 # environment variables or lacking them hardcoded values.
 #w32root=
 #w32ce_root=
+#w64root=
 #amd64root=
 
 if [ -f "$HOME/.gnupg-autogen.rc" ]; then
@@ -99,7 +102,7 @@ if [ "$myhost" = "w32" ]; then
         64)
           w32root="$w64root"
           [ -z "$w32root" ] && w32root="$HOME/w64root"
-          toolprefixes="$amd64_toolprefixes amd64-mingw32msvc"
+          toolprefixes="$w64_toolprefixes x86_64-w64-mingw32"
           ;;
         *)
           [ -z "$w32root" ] && w32root="$HOME/w32root"

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


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org