[cmor] 183/190: For some reason CFLAGS not getting it

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository cmor.

commit c2d98c21b58af799bdb22967078c3abe2293dc4c
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Jun 1 09:05:27 2014 +0100

    For some reason CFLAGS not getting it
---
 debian/patches/shlib-link.patch | 2 +-
 debian/rules                    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/patches/shlib-link.patch b/debian/patches/shlib-link.patch
index da318a9..58cbeb2 100644
--- a/debian/patches/shlib-link.patch
+++ b/debian/patches/shlib-link.patch
@@ -29,7 +29,7 @@ Index: cmor-2.8.3/Makefile.in
 +PIC_OBJS = $(patsubst %.c, %.pic_o, $(LIBSOURCES)) $(patsubst %.f90,%.pic_o, $(LIBFSOURCES))
 +
 +%.pic_o: %.c
-+	@CC@ @CPPFLAGS@  -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security  -D_FORTIFY_SOURCE=2  -fPIC -c -o $@  @DEBUG@ @MACROS@ @CFLAGS@  @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @ZFLAGS@  $<
++	@CC@ @CPPFLAGS@  -I/usr/include/ossp -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security  -D_FORTIFY_SOURCE=2  -fPIC -c -o $@  @DEBUG@ @MACROS@ @CFLAGS@  @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @ZFLAGS@  $<
 +
 +%.pic_o: %.f90
 +	@FC@ -c -o $@ -fPIC @FCFLAGS@ @DEBUG@ @MACROS@  $<
diff --git a/debian/rules b/debian/rules
index d7e51b1..df8ba6f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,8 @@ BUILD_ARCH_CPU := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
 PYVERS:=$(shell pyversions --supported)
 DESTDIR:=$(shell pwd)/debian/tmp
 
+export CFLAGS:=-I/usr/include/ossp  -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security  $(CFLAGS)
+
 %:
 	dh $@ --with python2
 
@@ -25,8 +27,7 @@ override_dh_auto_configure:
 	ln -sf  /usr/share/misc/config.sub 
 	dh_auto_configure -- --disable-color --enable-verbose-test  --with-uuid --without-python \
 		UUIDLDFLAGS="-lossp-uuid" UUIDFLAGS="-I/usr/include/ossp" SZLIBFLAGS=nosz \
-		CFLAGS="-I/usr/include/ossp -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security  $(CPPFLAGS) $(CFLAGS)" \
-                LDFLAGS="$(LDFLAGS)"
+		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 override_dh_auto_clean:
 	rm -rf config.sub config.log config.status libcmor.a libcmor.so.2 build test_grid configure CMIP5

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