[SCM] libav/ubuntu: Enable hardened build flags through dpkg-buildflags (Closes: #658929).

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit affd1c8b714ba34ce250f1a8d883746d3c3aaffc
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Fri Mar 2 13:45:57 2012 +0100

    Enable hardened build flags through dpkg-buildflags (Closes: #658929).
    
    (cherry picked from commit 220785bf48deb6c52c4a45fb3e760e2092e2c933)
    
    Signed-off-by: Reinhard Tartler <siretart at tauware.de>

diff --git a/debian/confflags b/debian/confflags
index 6000b9f..f11c857 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -159,9 +159,10 @@ ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
   lib1394-dev += libraw1394-dev, libdc1394-22-dev
 endif
 
-# Sanitize injected compiler in linker flags
-CFLAGS :=
-LDFLAGS :=
+# Enable hardened build flags through dpkg-buildflags
+CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
+CFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
+LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 # Various parts of Libav (and swscale) FTBFS when compiling with -fPIC

-- 
Libav/FFmpeg packaging