Bug#623621: win32-loader: please support building with mingw-w64

[Stephen Kitt <steve@sk2.org>]

Package: win32-loader
Version: 0.7.0
Severity: wishlist
Tags: patch


Hi,

mingw-w64, which is intended to eventually replace mingw32 and the
assorted packages, is now available in Debian along with new builds of
binutils and gcc. The attached patch allows win32-loader to build using
mingw-w64 rather than mingw32. Note that it requires nsis to support
mingw-w64 as well (#620099); I'll tag this bug appropriately.

Regards,

Stephen

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (500, 'testing'), (500, 'stable'), (200, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.38-2-686-bigmem (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -urN win32-loader-0.7.0.orig/debian/changelog win32-loader-0.7.0+nmu1/debian/changelog
--- win32-loader-0.7.0.orig/debian/changelog	2011-03-21 13:55:54.000000000 +0100
+++ win32-loader-0.7.0+nmu1/debian/changelog	2011-04-21 00:17:02.000000000 +0200
@@ -1,3 +1,10 @@
+win32-loader (0.7.0+nmu1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Rebuild with Debian dependencies only.
+
+ -- Stephen Kitt <steve@sk2.org>  Thu, 21 Apr 2011 00:17:02 +0200
+
 win32-loader (0.7.0) unstable; urgency=low
 
   The « Petite Arvine » release.
diff -urN win32-loader-0.7.0.orig/debian/control win32-loader-0.7.0+nmu1/debian/control
--- win32-loader-0.7.0.orig/debian/control	2011-03-17 13:35:18.000000000 +0100
+++ win32-loader-0.7.0+nmu1/debian/control	2011-04-21 00:12:58.000000000 +0200
@@ -6,7 +6,7 @@
 Build-Depends:
  debhelper (>= 7.0.50),
  nsis (>= 2.43),
- gcc-mingw32, mingw32-runtime,
+ mingw-w64,
  gettext,
  grub-pc (>= 1.99~rc1-3),
  loadlin (>= 1.6c.really1.6c.nobin-1~),
diff -urN win32-loader-0.7.0.orig/Makefile win32-loader-0.7.0+nmu1/Makefile
--- win32-loader-0.7.0.orig/Makefile	2011-03-21 13:55:54.000000000 +0100
+++ win32-loader-0.7.0+nmu1/Makefile	2011-04-21 00:18:36.000000000 +0200
@@ -4,14 +4,14 @@
 PACKAGE	:= win32-loader
 VERSION	:= $(shell head -n 1 debian/changelog | sed -e "s/^$(PACKAGE) (\(.*\)).*/\1/g")
 
-NSIS_CC		:= i586-mingw32msvc-gcc -Os
-NSIS_STRIP	:= i586-mingw32msvc-strip
+NSIS_CC		:= i686-w64-mingw32-gcc -Os
+NSIS_STRIP	:= i686-w64-mingw32-strip
 NSIS_CFLAGS	:= -Wl,--file-alignment,512 -Werror -D_WIN32_WINNT=0x0500
 
-ifeq ($(wildcard /usr/i586-mingw32msvc/include/exdll.h), /usr/i586-mingw32msvc/include/exdll.h)
+ifeq ($(wildcard /usr/i686-w64-mingw32/include/exdll.h), /usr/i686-w64-mingw32/include/exdll.h)
 NSIS_CFLAGS	+= -DHAVE_EXDLL_H
 else
-NSIS_CFLAGS	+= -L/usr/i586-mingw32msvc/lib/nsis -lpluginapi
+NSIS_CFLAGS	+= -L/usr/i686-w64-mingw32/lib/nsis -lpluginapi
 endif
 
 # Standard makensis call