[SCM] soundtouch/master: Preserve -03 in hardened builds.

micove-guest at users.alioth.debian.org micove-guest at users.alioth.debian.org
Sun Mar 4 22:17:05 UTC 2012


The following commit has been merged in the master branch:
commit 5b798f13f3b85eac1b95430bf2590420e4086803
Author: Miguel Colon <debian.micove at gmail.com>
Date:   Sun Mar 4 16:22:04 2012 -0500

    Preserve -03 in hardened builds.
    
    Upstream sets -03 but hardening overrides it with -O2. Honor it if noopt is
    not set. Require a versioned dpkg-dev for DEB_*_MAINT_APPEND and add a ~
    for stable-bpo support.

diff --git a/debian/control b/debian/control
index 32ff2fb..13de0fa 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 Uploaders: Alessio Treglia <alessio at debian.org>,
  Miguel Colon <debian.micove at gmail.com>
 Build-Depends: debhelper (>= 9),
+ dpkg-dev (>= 1.16.1.1~),
  dh-autoreconf
 Standards-Version: 3.9.3
 Homepage: http://www.surina.net/soundtouch/
diff --git a/debian/rules b/debian/rules
index 9eb8638..cfda002 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# Build with -O3 (as upstream does) if noopt is not set.
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+export DEB_CXXFLAGS_MAINT_APPEND=-O3
+endif
+
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-shared=yes
 

-- 
soundtouch packaging



More information about the pkg-multimedia-commits mailing list