[SCM] lame/master: Handle case on setting CFLAGS for systems where dpkg-dev (<< 1.15.7).

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Sat Mar 17 17:46:08 UTC 2012


The following commit has been merged in the master branch:
commit f230e6c172d6c9f7b32466486f318a94b98f87dd
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Sat Mar 17 13:41:59 2012 -0400

    Handle case on setting CFLAGS for systems where dpkg-dev (<< 1.15.7).

diff --git a/debian/changelog b/debian/changelog
index 4078f86..2386580 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lame (3.99.5+repack1-3) unstable; urgency=low
+
+  * Handle case on setting CFLAGS for systems where dpkg-dev (<< 1.15.7)
+
+ -- Andres Mejia <amejia at debian.org>  Sat, 17 Mar 2012 13:41:03 -0400
+
 lame (3.99.5+repack1-2) unstable; urgency=low
 
   * Allow dev package to be multiarch installable.
diff --git a/debian/rules b/debian/rules
index 1d08515..d930248 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,10 @@
 #!/usr/bin/make -f
 
-CFLAGS = $(shell dpkg-buildflags --get CFLAGS | sed -e 's/-g\|-O2//g')
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS 2>/dev/null | sed -e 's/-g\|-O2//g')
+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
 
 %:
 	dh $@ --parallel

-- 
lame packaging



More information about the pkg-multimedia-commits mailing list