[wcslib] 05/05: Propagate CFLAGS and LDFLAGS to Fortan and to test programs

[Ole Streicher]

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

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

commit e71515715bd843ff856c82267dbf50b1fcf9b4e4
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Oct 1 23:48:45 2013 +0200

    Propagate CFLAGS and LDFLAGS to Fortan and to test programs
---
 debian/changelog             |    6 ++++++
 debian/patches/fortify.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1c1fe56..57135fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wcslib (4.19-2) UNRELEASED; urgency=low
+
+  * Propagate CFLAGS and LDFLAGS to Fortran and test.
+
+ -- Ole Streicher <debian at liska.ath.cx>  Tue, 01 Oct 2013 23:49:21 +0200
+
 wcslib (4.19-1) unstable; urgency=low
 
   * New upstream version. Closes: #715907
diff --git a/debian/patches/fortify.patch b/debian/patches/fortify.patch
index cd00ee5..07e79ff 100644
--- a/debian/patches/fortify.patch
+++ b/debian/patches/fortify.patch
@@ -12,3 +12,34 @@ Description: Debian wants to add --D_FORTIFY_SOURCE=2 to CPPFLAGS. This
    WCSTRIG  := WRAPPER
  
  # C compiler and options.
+--- a/Fortran/GNUmakefile
++++ b/Fortran/GNUmakefile
+@@ -117,7 +117,7 @@
+ 
+ $(PICLIB)(%.o) : %.c
+ 	-@ echo ''
+-	   $(CC) $(CPPFLAGS) $(SHRFLAGS) -c $<
++	   $(CC) $(CPPFLAGS) $(CFLAGS) $(SHRFLAGS) -c $<
+ 	   $(AR) r $(PICLIB) $%
+ 	-@ $(RM) $%
+ 
+@@ -297,7 +297,7 @@
+ 	   $(MAKE) -C ../pgsbox lib
+ 
+ tofits : ../C/test/tofits.c
+-	   $(CC) $(CFLAGS) -o $@ $<
++	   $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $<
+ 
+ pih.fits : ../C/test/pih.keyrec tofits
+ 	   sed '/^BADKEYREC/q' $< | ./tofits > $@
+--- a/C/GNUmakefile
++++ b/C/GNUmakefile
+@@ -347,7 +347,7 @@
+ 	   $(MAKE) -C ../pgsbox $(notdir $@)
+ 
+ tofits : test/tofits.c
+-	   $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $<
++	   $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $<
+ 
+ pih.fits : test/pih.keyrec tofits
+ 	   ./tofits < $< > $@

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