[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. debian/1.6.1-2-9-g6ec83b0

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 181d023a2b6819296e01faa5d12de3ad84af6d68
Author: Alexander Wirt <formorer at debian.org>
Date:   Sat Mar 31 10:00:05 2012 +0200

    Enable hardening buildflags
    
    Closes: #656866

diff --git a/debian/rules b/debian/rules
index 62bfd5b..9bf1509 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,17 +8,12 @@ b := $(shell pwd)/debian
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-# -Wall disabled until source is fixed to not print tons of warnings with it. :)
-#CFLAGS = -Wall -g
-CFLAGS = -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -O0
-else
-CFLAGS += -O2
-endif
+CFLAGS = `dpkg-buildflags --get CFLAGS`
+CFLAGS += `dpkg-buildflags --get CPPFLAGS`
+LDFLAGS = `dpkg-buildflags --get LDFLAGS`
 
 SHELL		= /bin/sh -e
-CONFIGURE	= CFLAGS='$(CFLAGS)' ./configure --prefix=/usr \
+CONFIGURE	= CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --prefix=/usr \
 				--mandir=/usr/share/man \
 				--bindir=/usr/sbin \
 				--sbindir=/usr/lib/cgi-bin/icinga \

-- 
debian packaging of icinga(-core)