[SCM] ffmpeg/master: Enable all hardening options except pie

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Mon Sep 26 18:39:03 UTC 2016


The following commit has been merged in the master branch:
commit 08444f3b74ea69b4c7856267b665255076a7a134
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Sep 26 20:38:47 2016 +0200

    Enable all hardening options except pie

diff --git a/debian/rules b/debian/rules
index 7d969c3..edd7aee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,8 @@ include /usr/share/dpkg/architecture.mk
 
 # Ubuntu ld adds -Bsymbolic-functions by default, but that prevents FFmpeg from building.
 export DEB_LDFLAGS_MAINT_STRIP=-Wl,-Bsymbolic-functions
+# build with all hardening flags except pie
+export DEB_MAINT_BUILD_OPTIONS=hardening=+all,-pie
 
 # Package name for the extra flavor.
 EXTRA_PKG := $(shell sed -nr 's/^Package:[[:space:]]*(.*extra[0-9]+)[[:space:]]*$$/\1/p' debian/control)
@@ -174,6 +176,10 @@ ifneq (,$(filter $(DEB_HOST_ARCH),mips mipsel))
 	CONFIG += --disable-mipsfpu
 endif
 
+# export all *FLAG env vars
+export DPKG_EXPORT_BUILDFLAGS
+include /usr/share/dpkg/buildflags.mk
+
 # Use the default debhelper scripts, where possible.
 # Enable parallel building.
 %:

-- 
ffmpeg packaging



More information about the pkg-multimedia-commits mailing list