[ftools-fv] 04/04: Propagate CPPFLAGS and LDFLAGS for hardening.

[Ole Streicher]

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

olebole-guest pushed a commit to branch debian
in repository ftools-fv.

commit f709d898c0fb962d27101936a5542aa895fb1ac6
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Oct 9 11:14:14 2013 +0200

    Propagate CPPFLAGS and LDFLAGS for hardening.
---
 debian/changelog                      |    3 ++-
 debian/patches/pow_fix_makefile.patch |   11 +++++++++--
 debian/rules                          |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 53a59bb..de2eb97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ ftools-fv (5.3+dfsg-3) unstable; urgency=low
   * Call wish8.5 and depend of tk8.5 (required because we use itcl{3}
     which depends on tk8.5). Closes: #725689
   * Push standard to 3.9.4 w/o changes.
+  * Propagate CPPFLAGS and LDFLAGS for hardening.
 
- -- Ole Streicher <debian at liska.ath.cx>  Wed, 09 Oct 2013 11:10:34 +0200
+ -- Ole Streicher <debian at liska.ath.cx>  Wed, 09 Oct 2013 11:13:33 +0200
 
 ftools-fv (5.3+dfsg-2) unstable; urgency=low
 
diff --git a/debian/patches/pow_fix_makefile.patch b/debian/patches/pow_fix_makefile.patch
index 5d514e4..eb2cc3a 100644
--- a/debian/patches/pow_fix_makefile.patch
+++ b/debian/patches/pow_fix_makefile.patch
@@ -2,7 +2,7 @@ Author: Ole Streicher <debian at liska.ath.cx>
 Description: Set variables in Makefile.in to get pow compiled (Q&D patch)
 --- a/tcltk/pow/Makefile.in
 +++ b/tcltk/pow/Makefile.in
-@@ -31,40 +31,37 @@
+@@ -31,40 +31,38 @@
  		  Probe.html Profile.html ROI.html Regions.html Ruler.html \
  		  Scripting.html Tools.html XRange.html
  
@@ -24,6 +24,7 @@ Description: Set variables in Makefile.in to get pow compiled (Q&D patch)
 +INSTALLDIR	= $(DESTDIR)@prefix@
  CC		= @CC@
  RANLIB		= @RANLIB@
++CPPFLAGS	= @CPPFLAGS@
  CFLAGS		= @CFLAGS@
  #CFLAGS		= -g -DTCL_MEM_DEBUG
  DEFS		= @DEFS@ -DVISU_LIBRARY=\"${INSTALLDIR}/lib/pow\" 
@@ -51,7 +52,7 @@ Description: Set variables in Makefile.in to get pow compiled (Q&D patch)
  
  #----------------------------------------------------------------------------
  # Targets:
-@@ -84,28 +81,31 @@
+@@ -84,28 +82,31 @@
  	${SHLIB_LD} ${LD_FLAGS} ${SHARED_OBJ} ${SHLIB_LD_LIBS} -o ${SHARED_LIB}
  
  install:
@@ -91,3 +92,9 @@ Description: Set variables in Makefile.in to get pow compiled (Q&D patch)
  	done
  
  clean:
+@@ -134,4 +135,4 @@
+ 
+ 
+ .c.o:
+-	${CC} -c ${CFLAGS} ${DEFS} ${IFLAGS} $<
++	${CC} -c ${CPPFLAGS} ${CFLAGS} ${DEFS} ${IFLAGS} $<
diff --git a/debian/rules b/debian/rules
index 4d52468..946d980 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ override_dh_autoreconf:
 	dh_autoreconf "(cd tcltk/pow ; autoreconf)"
 
 override_dh_auto_configure:
-	dh_auto_configure -D tcltk/pow
+	dh_auto_configure -D tcltk/pow -- CC=gcc
 
 override_dh_auto_build:
 	dh_auto_build -D tcltk/pow

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