From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 19 Oct 2012 13:14:24 +0000 (+0200)
Subject: Use dpkg-buildflags in build process
X-Git-Tag: v1.6.24~27
X-Git-Url: http://git.indexdata.com/cgi-bin?a=commitdiff_plain;ds=sidebyside;h=d1123238be15f0867c2011efe97b4b318e2b9793;p=pazpar2-moved-to-github.git

Use dpkg-buildflags in build process

This is to use hardening options for the libraries and programs.
Refer to http://wiki.debian.org/Hardening for more information.
---

diff --git a/debian/rules b/debian/rules
index e5d60be..18893f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,26 +15,22 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --with-yaz=/usr/bin --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
+	CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+		LDFLAGS="$(LDFLAGS)" \
+		./configure --host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE) \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		--with-yaz=/usr/bin \
+		--sysconfdir=/etc --prefix=/usr
 
 build: build-stamp