From 67eedee1f3f4419a9ded56b1990ff48800c00711 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sat, 31 Mar 2012 17:51:35 -0400 Subject: support dpkg 1.16.0 by removing new-style hardening (/usr/share/dpkg/buildflags.mk) --- debian/rules | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index 7283e7a..23c86f9 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,6 @@ #export DH_VERBOSE=1 -include /usr/share/dpkg/buildflags.mk export DEB_BUILD_HARDENING=1 DESTDIR=$(CURDIR)/debian/tmp @@ -16,7 +15,10 @@ DDEBUG=`if (echo $(DEB_BUILD_OPTIONS) | grep -q debug) then \ #export DEB_CFLAGS_MAINT_APPEND = -O2 -fno-strict-aliasing -export CFLAGS += -O2 -fno-strict-aliasing \ +CFLAGS := $(shell dpkg-buildflags --get CFLAGS) +LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) + +CFLAGS += -O2 -fno-strict-aliasing \ -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_COLUMN_METADATA \ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_SOUNDEX=1 \ -DSQLITE_ENABLE_UNLOCK_NOTIFY \ @@ -24,12 +26,11 @@ export CFLAGS += -O2 -fno-strict-aliasing \ -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1 \ -DSQLITE_HAS_CODEC -/usr/share/dpkg/buildflags.mk: - configure: configure-stamp configure-stamp: dh_testdir autoconf + echo CFLAGS = $$CFLAGS ./configure --prefix=/usr --mandir="/usr/share/man" \ $(confflags) --enable-threadsafe \ --enable-load-extension \ -- cgit v1.2.3