r45007 - in /packages/fftw3/trunk/debian: changelog rules

[jtaylor-guest at users.alioth.debian.org]

Author: jtaylor-guest
Date: Sat Jun  9 20:13:53 2012
New Revision: 45007

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45007
Log:
enable hardening options

Modified:
    packages/fftw3/trunk/debian/changelog
    packages/fftw3/trunk/debian/rules

Modified: packages/fftw3/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw3/trunk/debian/changelog?rev=45007&op=diff
==============================================================================
--- packages/fftw3/trunk/debian/changelog (original)
+++ packages/fftw3/trunk/debian/changelog Sat Jun  9 20:13:53 2012
@@ -6,8 +6,9 @@
     avx not supported yet 
   * drop 04_improve_semaphore_detection.diff
     semaphores are not shared anymore since 3.2.2
-
- -- Julian Taylor <jtaylor.debian at googlemail.com>  Sat, 09 Jun 2012 20:50:26 +0200
+  * enable hardening options
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Sat, 09 Jun 2012 21:14:23 +0200
 
 fftw3 (3.3.2-1) unstable; urgency=low
 

Modified: packages/fftw3/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw3/trunk/debian/rules?rev=45007&op=diff
==============================================================================
--- packages/fftw3/trunk/debian/rules (original)
+++ packages/fftw3/trunk/debian/rules Sat Jun  9 20:13:53 2012
@@ -5,7 +5,9 @@
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-CFLAGS := -g -Wall
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
 # old configure stuff needs a --target
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -56,7 +58,7 @@
 	archconfflags := $(archconfflags) F77="gfortran -ff2c"
 endif
 
-SETCFLAGS := CFLAGS='$(CFLAGS)'
+SETCFLAGS := CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' CPPFLAGS='$(CPPFLAGS)'
 
 # common configure options
 archconfflags := $(archconfflags) --prefix=/usr --enable-shared --enable-threads --enable-openmp --enable-mpi --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) MPILIBS="$(shell mpicc --showme:link)"