[SCM] pd-cyclone/master: pass hardening-flags

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Sun Jan 24 23:05:58 UTC 2016


The following commit has been merged in the master branch:
commit 6539a5eea7df3a5c21db52037760df8abcd4ec47
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Mon Jan 25 00:05:12 2016 +0100

    pass hardening-flags

diff --git a/debian/rules b/debian/rules
index 9e60060..e99e79e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,25 +1,20 @@
 #!/usr/bin/make -f
+# Copyright © 2016 IOhannes m zmölnig <umlaeute at debian.org>
+# Description: Main Debian packaging script for pd-cyclone
+#
+# The Standard Improved BSD License applies.
 
-
-include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/class/pd.mk
+include /usr/share/cdbs/1/rules/utils.mk
 
+CFLAGS+=$(CPPFLAGS)
 
-## use hardening some flags
-DPKG_EXPORT_BUILDFLAGS = 1
-DEB_BUILD_MAINT_OPTIONS=hardening=-format,+fortify,+stackprotector,+relro
-export DEB_BUILD_MAINT_OPTIONS
-include /usr/share/dpkg/buildflags.mk
-
-# Relax inclusion of optional features to ease backporting
-CDBS_BUILD_DEPENDS_rules_utils_copyright-check =
 
 DEB_MAKE_INSTALL_TARGET = DESTDIR=$(DEB_DESTDIR) \
 			  prefix=/usr pkglibdir=$(pkglibdir) install
 
-
 pkglibdir = /usr/lib/pd/extra
 
 clean::
@@ -27,4 +22,5 @@ clean::
 	rm -f cyclist
 
 build/cyclist::
-	$(MAKE) -f debian/Makefile.cyclist
+	$(MAKE) -f debian/Makefile.cyclist \
+		CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"

-- 
pd-cyclone packaging



More information about the pkg-multimedia-commits mailing list