[silo-llnl] 49/96: Small fixes

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository silo-llnl.

commit 2d68f7cc514087501b0c7a8e0e452c71fbfbc10f
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Jun 16 20:44:46 2012 +0100

    Small fixes
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 debian/rules     | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f7379f1..4e6bcdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 silo-llnl (4.8-13) unstable; urgency=low
 
   * Enable QT version 4.8.2 as well. Closes: #671614.
+  * Pass CPPFLAGS, CFLAGS, LDFLAGS in rules to enable hardening.
 
  -- Alastair McKinstry <mckinstry at debian.org>  Sat, 16 Jun 2012 11:46:24 +0100
 
diff --git a/debian/control b/debian/control
index e04f090..e98bb0b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: science
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper (>= 8.1.3~), libreadline-dev, libhdf5-mpi-dev | libhdf5-dev, zlib1g-dev, 
-  libqt4-dev (<= 4.8.2~), gfortran, python-dev, chrpath, python-all-dev, mpi-default-dev, autoconf-archive, autoconf, automake, libtool, dh-autoreconf (>= 4~)
+  libqt4-dev (<< 4:4.9~), gfortran, python-dev, chrpath, python-all-dev, mpi-default-dev, autoconf-archive, autoconf, automake, libtool, dh-autoreconf (>= 4~)
 Build-Conflicts: qt3-dev-tools
 Standards-Version: 3.9.3
 Homepage:  https://wci.llnl.gov/codes/silo
diff --git a/debian/rules b/debian/rules
index c290912..ed03884 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,16 +25,16 @@ override_dh_autoreconf:
 	dh_autoreconf --as-needed
 
 override_dh_auto_configure:
-	LDFLAGS=" -Wl,--as-needed" dh_auto_configure -- --enable-pythonmodule --enable-silex --with-qt=/usr --enable-pythonmodule --enable-silex --with-qt-bin=/usr/bin --with-qt-lib=/usr/lib  --with-qt-include=/usr/include/qt4 --with-hdf5=/usr/include,/usr/lib CPPFLAGS=" -I$(MPI_INC)"  CC=$(CC) 
+	LDFLAGS="$(LDFLAGS) -Wl,--as-needed" dh_auto_configure -- --enable-pythonmodule --enable-silex --with-qt=/usr --enable-pythonmodule --enable-silex --with-qt-bin=/usr/bin --with-qt-lib=/usr/lib  --with-qt-include=/usr/include/qt4 --with-hdf5=/usr/include,/usr/lib CPPFLAGS=" -I$(MPI_INC) $(CPPFLAGS)"  CC=$(CC)  CFLAGS=$(CFLAGS)
 
 override_dh_auto_build:
 	dh_auto_build
 	set -e ; for p in $(PYVERS) ; do   \
-		 LDFLAGS=" -Wl,--as-needed" dh_auto_configure -- \
+		 LDFLAGS=" -Wl,--as-needed $(LDFLAGS)" dh_auto_configure -- \
 			--enable-pythonmodule --enable-silex \
 			--with-qt=/usr --with-qt-bin=/usr/bin --with-qt-lib=/usr/lib \
 			--with-qt-include=/usr/include/qt4 \
-			 --with-hdf5=/usr/include,/usr/lib PYTHON=$$p CPPFLAGS=" -I$(MPI_INC)" CC=$(CC)  ; \
+			 --with-hdf5=/usr/include,/usr/lib PYTHON=$$p CPPFLAGS=" -I$(MPI_INC) $(CPPFLAGS)" CC=$(CC)  ; \
 		$(MAKE) -C tools/browser CXX=$(CC) ; \
 		$(MAKE) -C tools/python ; \
 		mkdir -p  debian/tmp/usr/lib/pyshared/$$p ;  \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/silo-llnl.git