From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 19 Oct 2012 12:57:58 +0000 (+0200)
Subject: Use dpkg-buildflags in build process
X-Git-Tag: v1.3.50~21
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=9c542c267b45b0a71ad7797308fad7c3cf659de5;p=metaproxy-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 64ddde7..0e08d95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,26 +11,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
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-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.
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --with-yazpp=/usr/bin --without-usemarcon
-
-#--infodir=\$${prefix}/share/info --enable-shared --enable-static --with-xslt
-
+	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-yazpp=/usr/bin --without-usemarcon \
+		--prefix=/usr
 
 build: build-stamp
 build-stamp:  config.status