[pkg-wpa-devel] r1762 - in /iw/trunk/debian: changelog patches/append-cppflags.patch patches/series rules

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

Author: kelmo-guest
Date: Tue May 15 12:19:33 2012
New Revision: 1762

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1762
Log:
Add append-cppflags.patch to modify upstream Makefile in order to append
CPPFLAGS to CFLAGS if set in build environment.

Added:
    iw/trunk/debian/patches/append-cppflags.patch
Modified:
    iw/trunk/debian/changelog
    iw/trunk/debian/patches/series
    iw/trunk/debian/rules

Modified: iw/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/changelog?rev=1762&op=diff
==============================================================================
--- iw/trunk/debian/changelog (original)
+++ iw/trunk/debian/changelog Tue May 15 12:19:33 2012
@@ -14,9 +14,10 @@
   [ Kel Modderman ]
   * Add support for cross-building by setting CC to something
     appropriate.
-  * Use dh 9 exported CPPFLAGS.
+  * Add append-cppflags.patch to modify upstream Makefile in order to append
+    CPPFLAGS to CFLAGS if set in build environment.
 
- -- Kel Modderman <kel at otaku42.de>  Tue, 15 May 2012 17:50:31 +1000
+ -- Kel Modderman <kel at otaku42.de>  Tue, 15 May 2012 22:17:42 +1000
 
 iw (3.2-1) unstable; urgency=low
 

Added: iw/trunk/debian/patches/append-cppflags.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/patches/append-cppflags.patch?rev=1762&op=file
==============================================================================
--- iw/trunk/debian/patches/append-cppflags.patch (added)
+++ iw/trunk/debian/patches/append-cppflags.patch Tue May 15 12:19:33 2012
@@ -1,0 +1,16 @@
+Description: Append CPPFLAGS to CFLAGS if set in environment
+Author: Kel Modderman <kel at otaku42.de>
+---
+--- a/Makefile
++++ b/Makefile
+@@ -14,6 +14,10 @@ CC ?= "gcc"
+ CFLAGS ?= -O2 -g
+ CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration
+ 
++ifneq ($(CPPFLAGS),)
++CFLAGS += $(CPPFLAGS)
++endif
++
+ OBJS = iw.o genl.o event.o info.o phy.o \
+ 	interface.o ibss.o station.o survey.o util.o \
+ 	mesh.o mpath.o scan.o reg.o version.o \

Modified: iw/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/patches/series?rev=1762&op=diff
==============================================================================
--- iw/trunk/debian/patches/series (original)
+++ iw/trunk/debian/patches/series Tue May 15 12:19:33 2012
@@ -1,1 +1,2 @@
 dont-use-git-on-the-buildd.patch
+append-cppflags.patch

Modified: iw/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/rules?rev=1762&op=diff
==============================================================================
--- iw/trunk/debian/rules (original)
+++ iw/trunk/debian/rules Tue May 15 12:19:33 2012
@@ -1,6 +1,5 @@
 #!/usr/bin/make -f
 
-CFLAGS  += $(CPPFLAGS)
 SBINDIR = /sbin
 V       = 1