From 51232e5c5703732ae0b457a9d35795fcea95bc34 Mon Sep 17 00:00:00 2001
From: Aron Xu <aron@debian.org>
Date: Wed, 30 May 2012 07:53:34 +0800
Subject: Better handling of build variables.

---
 debian/rules | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'debian/rules')

diff --git a/debian/rules b/debian/rules
index ab24f8e..c85dbff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,17 @@
 #!/usr/bin/make -f
-export DH_VERBOSE=1
 
 # The versions of python currently supported
 PYVERS=$(shell pyversions -s)
 # The current default version of python
 PYVER=$(shell pyversions -d)
 
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 CFLAGS = `dpkg-buildflags --get CFLAGS` -Wall
 LDFLAGS = `dpkg-buildflags --get LDFLAGS` -Wl,--as-needed
 CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
 
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    CFLAGS += -fno-strict-aliasing
-endif
-
 TARGETS := main $(PYVERS) $(PYVERS:%=%-dbg)
 
 WITH_UDEB := $(shell dpkg-vendor --derives-from Ubuntu && echo yes)
-- 
cgit v1.2.3