From 9cdd5e99a46e59d528d16f95cd8bbdcbf21665ae Mon Sep 17 00:00:00 2001 From: Matt Johnston Date: Fri, 4 Oct 2013 22:22:35 +0800 Subject: [PATCH] Fix up debian build --- debian/changelog | 1 + debian/rules | 11 ++++------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7c9f23d..bae4211 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ dropbear (2013.59-0.1) unstable; urgency=low * New upstream release. + * Build with DEB_BUILD_MAINT_OPTIONS = hardening=+all -- Matt Johnston Fri, 4 Oct 2013 22:54:00 +0800 diff --git a/debian/rules b/debian/rules index e1a4b7a..c6b2e85 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,9 @@ #!/usr/bin/make -f +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + #export DH_OPTIONS DEB_HOST_GNU_TYPE ?=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) @@ -9,13 +13,6 @@ ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) STRIP =: nostrip endif -CFLAGS =-Wall -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS +=-O0 -else - CFLAGS +=-O2 -endif - CONFFLAGS = CC =gcc ifneq (,$(findstring diet,$(DEB_BUILD_OPTIONS)))