[pkg-wpa-devel] r1735 - in /iw/trunk/debian: changelog rules

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Wed Apr 18 08:40:16 2012
New Revision: 1735

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1735
Log:
* Use dpkg-buildflags to get default CFLAGS.
* Add support for cross-building by setting CC to something
  appropriate.
* Reduce verbosity of upstream build system to allow errors/warnings
  to be more visible.

Modified:
    iw/trunk/debian/changelog
    iw/trunk/debian/rules

Modified: iw/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/changelog?rev=1735&op=diff
==============================================================================
--- iw/trunk/debian/changelog (original)
+++ iw/trunk/debian/changelog Wed Apr 18 08:40:16 2012
@@ -1,5 +1,6 @@
 iw (3.4-1) unstable; urgency=low
 
+  [ Stefan Lippers-Hollmann ]
   * New upstream release:
     - iw: add HT options for ibss
   * bump standards version to 3.9.3, no changes necessary.
@@ -10,7 +11,14 @@
   * Remove Faidon Liambotis <paravoid at debian.org> from Uploaders as per
     his request, many thanks for all past efforts Faidon.
 
- -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Tue, 17 Apr 2012 23:44:19 +0200
+  [ Kel Modderman ]
+  * Use dpkg-buildflags to get default CFLAGS.
+  * Add support for cross-building by setting CC to something
+    appropriate.
+  * Reduce verbosity of upstream build system to allow errors/warnings
+    to be more visible.
+
+ -- Kel Modderman <kel at otaku42.de>  Wed, 18 Apr 2012 18:39:46 +1000
 
 iw (3.2-1) unstable; urgency=low
 

Modified: iw/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/rules?rev=1735&op=diff
==============================================================================
--- iw/trunk/debian/rules (original)
+++ iw/trunk/debian/rules Wed Apr 18 08:40:16 2012
@@ -1,7 +1,16 @@
 #!/usr/bin/make -f
-export CFLAGS = -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
-export V=1
-export SBINDIR="/sbin/"
+
+CFLAGS  = $(shell dpkg-buildflags --get CFLAGS)
+SBINDIR = /sbin
+V       = 0
+
+DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE  := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+	CC=$(DEB_HOST_GNU_TYPE)-gcc
+endif
+
+export CC CFLAGS SBINDIR V
 
 %:
 	dh $@