Fix up debian build

This commit is contained in:
Matt Johnston 2013-10-04 22:22:35 +08:00
parent 897ed7125b
commit 9cdd5e99a4
2 changed files with 5 additions and 7 deletions

1
debian/changelog vendored
View File

@ -1,6 +1,7 @@
dropbear (2013.59-0.1) unstable; urgency=low dropbear (2013.59-0.1) unstable; urgency=low
* New upstream release. * 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 -- Matt Johnston <matt@ucc.asn.au> Fri, 4 Oct 2013 22:54:00 +0800

11
debian/rules vendored
View File

@ -1,5 +1,9 @@
#!/usr/bin/make -f #!/usr/bin/make -f
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
#export DH_OPTIONS #export DH_OPTIONS
DEB_HOST_GNU_TYPE ?=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_HOST_GNU_TYPE ?=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?=$(shell dpkg-architecture -qDEB_BUILD_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 STRIP =: nostrip
endif endif
CFLAGS =-Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS +=-O0
else
CFLAGS +=-O2
endif
CONFFLAGS = CONFFLAGS =
CC =gcc CC =gcc
ifneq (,$(findstring diet,$(DEB_BUILD_OPTIONS))) ifneq (,$(findstring diet,$(DEB_BUILD_OPTIONS)))