[SCM] audacity/master: Use build flags from the environment (dpkg-buildflags).

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 69eb7072b3a244428e6b91c845371394897a0280
Author: Benjamin Drung <bdrung at debian.org>
Date:   Wed Mar 14 14:41:53 2012 +0100

    Use build flags from the environment (dpkg-buildflags).
    
    Thanks: Simon Ruderich <simon at ruderich.org>
    Closes: #663275

diff --git a/debian/patches/portmixer-missing-dpkg-buildflags.patch b/debian/patches/portmixer-missing-dpkg-buildflags.patch
new file mode 100644
index 0000000..024d0a3
--- /dev/null
+++ b/debian/patches/portmixer-missing-dpkg-buildflags.patch
@@ -0,0 +1,30 @@
+Description: Use build flags from the environment (dpkg-buildflags).
+Author: Simon Ruderich <simon at ruderich.org>
+Last-Update: 2012-03-10
+Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=486
+Bug-Debian: http://bugs.debian.org/663275
+
+--- a/lib-src/portmixer/Makefile.in
++++ b/lib-src/portmixer/Makefile.in
+@@ -9,9 +9,12 @@
+ RANLIB   = @RANLIB@
+ 
+ DEFS    += @DEFS@
++CFLAGS  += @CFLAGS@
+ CFLAGS  += @cflags@
+ CFLAGS  += @include@
+ 
++CPPFLAGS = @CPPFLAGS@
++
+ all : $(LIBRARY)
+ 
+ tests:
+@@ -22,7 +25,7 @@
+ 	$(RANLIB) $(LIBRARY)
+ 
+ %.o : src/%.c
+-	$(CC) $(CFLAGS) $(DEFS) -c $(<) -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $(<) -o $@
+ 
+ clean : 
+ 	-rm -f $(LIBRARY)
diff --git a/debian/patches/series b/debian/patches/series
index 10f170a..fc7324c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ disable-dynamic-ffmpeg.patch
 disable-dynamic-lame.patch
 label-region-relation.patch
 additional-mime-types.patch
+portmixer-missing-dpkg-buildflags.patch

-- 
Audacity debian packaging