diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2013-10-04 22:22:35 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2013-10-04 22:22:35 +0800 |
| commit | 9cdd5e99a46e59d528d16f95cd8bbdcbf21665ae (patch) | |
| tree | d4bb1e57b199b7b6a3d10544d2eafc1b3781c9f8 /debian | |
| parent | 897ed7125bd1b2618c762cb437da63f2c7b7aa8b (diff) | |
Fix up debian build
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | 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 <matt@ucc.asn.au> 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))) |