A first set of patch to allow the use of i686-w64-mingw32.
authorWerner Koch <wk@gnupg.org>
Wed, 24 Apr 2013 18:57:17 +0000 (20:57 +0200)
committerWerner Koch <wk@gnupg.org>
Wed, 24 Apr 2013 18:57:17 +0000 (20:57 +0200)
* autogen.sh <build-w32>: Prefer the i686-w64-mingw32 toolchain.

* src/Makefile.am (gpg4win_pkg_crypt_make): Rename to
gpg4win_pkg_crypt_make_args to make it actually work.

* src/gpg4win.mk.in (stamps/stamp-$(1)-02-configure): Use host and
build instead host_cpu+host_os.

autogen.sh
src/Makefile.am
src/gpg4win.mk.in

index afe16d7..45de064 100755 (executable)
@@ -104,7 +104,7 @@ if [ "$myhost" = "w32" ]; then
     case $myhostsub in
         *)
           [ -z "$w32root" ] && w32root="$HOME/w32root"
-          toolprefixes="$w32_toolprefixes i586-mingw32msvc"
+          toolprefixes="$w32_toolprefixes i686-w64-mingw32 i586-mingw32msvc"
           toolprefixes="$toolprefixes i386-mingw32msvc mingw32"
           extraoptions="$w32_extraoptions"
           ;;
index e6ad550..9ff7c9d 100644 (file)
@@ -338,7 +338,7 @@ gpg4win_pkg_bzip2_make_args = \
 gpg4win_pkg_bzip2_make_args_inst = \
   PREFIX=$$$${pkgidir} CC=$(CC) AR=$(AR) RANLIB=$(RANLIB)
 
-gpg4win_pkg_crypt_make = \
+gpg4win_pkg_crypt_make_args = \
   CC=$(CC) AR=$(AR)
 
 gpg4win_pkg_crypt_make_args_inst = \
index 1324335..79b1d7a 100644 (file)
@@ -135,8 +135,8 @@ stamps/stamp-$(1)-02-configure: stamps/stamp-$(1)-01-patch
          cd "$$$${pkgbdir}";                           \
         eval "../$$$${pkg_version}/configure"          \
                --prefix="$$$${pkgidir}"                \
-               --host=$(host_cpu)-$(host_os)           \
-               --build=$(build_cpu)-$(build_os)        \
+               --host=$(host)          \
+               --build=$(build)        \
                $$$${pkgcfg} CFLAGS=\"-mms-bitfields $$$${pkgextracflags}\")
        touch stamps/stamp-$(1)-02-configure