[SCM] x264/master: Fix issue of setting hardened CFLAGS for shared library.

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

The following commit has been merged in the master branch:
commit 678eb2a8a45dfb43f6c0380e05f729485f584e5f
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Sat Mar 17 14:03:17 2012 -0400

    Fix issue of setting hardened CFLAGS for shared library.

diff --git a/debian/changelog b/debian/changelog
index e7a35f3..855097f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x264 (2:0.120.2171+git01f7a33-3) unstable; urgency=low
+
+  * Fix issue of setting hardened CFLAGS for shared library.
+
+ -- Andres Mejia <amejia at debian.org>  Sat, 17 Mar 2012 14:00:21 -0400
+
 x264 (2:0.120.2171+git01f7a33-2) unstable; urgency=low
 
   * Allow dev package to be multiarch installable.
diff --git a/debian/confflags b/debian/confflags
index 95e6f5b..143a7b8 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -9,6 +9,7 @@ ifeq (,$(CFLAGS))
   # Handle case for versions of Debian/Ubuntu that have dpkg-dev (<< 1.15.7).
   CFLAGS = -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security
 endif
+shared_extra_cflags = $(CFLAGS)
 
 LDFLAGS := $(filter-out %-Bsymbolic-functions,$(LDFLAGS))
 

-- 
x264 packaging