[Pkg-gnupg-commit] r218 - in /gnupg/trunk/debian: changelog control rules

[thijs at users.alioth.debian.org]

Author: thijs
Date: Mon Feb 20 22:08:15 2012
New Revision: 218

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=218
Log:
Build win32 package with mingw-w64, thanks Stephen Kitt
Enable hardened build flags, thanks Moritz Muehlenhoff

Modified:
    gnupg/trunk/debian/changelog
    gnupg/trunk/debian/control
    gnupg/trunk/debian/rules

Modified: gnupg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/changelog?rev=218&op=diff
==============================================================================
--- gnupg/trunk/debian/changelog (original)
+++ gnupg/trunk/debian/changelog Mon Feb 20 22:08:15 2012
@@ -10,6 +10,8 @@
   * Mark packages Multi-Arch: foreign. thanks Colin Watson (closes: #649490).
   * Fix path to README.BUGS.Debian.gz in presubj (closes: #614962).
   * Add Crypto Stick to udev rules (closes: #648332).
+  * Build win32 package with mingw-w64, thanks Stephen Kitt (closes: #623526).
+  * Enable hardened build flags, thanks Moritz Muehlenhoff (closes: #653480).
 
  -- Thijs Kinkhorst <thijs at debian.org>  Mon, 20 Feb 2012 21:53:58 +0100
 

Modified: gnupg/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/control?rev=218&op=diff
==============================================================================
--- gnupg/trunk/debian/control (original)
+++ gnupg/trunk/debian/control Mon Feb 20 22:08:15 2012
@@ -10,7 +10,7 @@
  libusb-dev [!hurd-i386],
  libreadline-dev, file, gettext, 
  libcurl4-gnutls-dev
-Build-Depends-Indep: mingw32
+Build-Depends-Indep: mingw-w64
 Homepage: http://www.gnupg.org
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnupg/gnupg/trunk/

Modified: gnupg/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/rules?rev=218&op=diff
==============================================================================
--- gnupg/trunk/debian/rules (original)
+++ gnupg/trunk/debian/rules Mon Feb 20 22:08:15 2012
@@ -31,18 +31,22 @@
 endif
 
 LDFLAGS += -Wl,--as-needed
+LDFLAGS += `dpkg-buildflags --get LDFLAGS`
+
+CPPFLAGS_DEF = `dpkg-buildflags --get CPPFLAGS`
+CFLAGS_DEF = `dpkg-buildflags --get CFLAGS`
 
 ################################### configure ################################
 
 build-deb/config.status:
 	dh_testdir
 	(mkdir -p $(@D); cd $(@D); \
-	    ../configure $(CONFARGS) $(HOSTARG) --without-libcurl)
+	    ../configure LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS_DEF)" CFLAGS="$(CFLAGS_DEF)" $(CONFARGS) $(HOSTARG) --without-libcurl)
 
 build-deb-curl/config.status:
 	dh_testdir
 	(mkdir -p $(@D); cd $(@D); \
-	    ../configure $(CONFARGS) $(HOSTARG))
+	    ../configure LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS_DEF)" CFLAGS="$(CFLAGS_DEF)" $(CONFARGS) $(HOSTARG))
 
 build-udeb/config.status:
 	dh_testdir
@@ -53,8 +57,8 @@
 build-win32/config.status:
 	dh_testdir
 	(mkdir -p $(@D); cd $(@D); CFLAGS="-g -Os" \
-	    ../configure $(CONFARGS) --host i586-mingw32msvc \
-	    --disable-gnupg-iconv --without-bzip2 --without-readline --without-libcurl)
+	    ../configure $(CONFARGS) --host i686-w64-mingw32 \
+	    --disable-gnupg-iconv --without-bzip2 --without-readline --without-libcurl --disable-ldap)
 
 ##################################### build ##################################