[med-svn] [scythe] 01/02: Add patch to include CPPFLAGS in CFLAGS

[Kevin Murray]

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

daube-guest pushed a commit to branch master
in repository scythe.

commit 68620d3a4695db9950441a1c09b9e9395054255f
Author: Kevin Murray <spam at kdmurray.id.au>
Date:   Mon Oct 19 11:25:35 2015 +1100

    Add patch to include CPPFLAGS in CFLAGS
---
 .../patches/0004-Include-CPPFLAGS-in-CFLAGS.patch  | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 30 insertions(+)

diff --git a/debian/patches/0004-Include-CPPFLAGS-in-CFLAGS.patch b/debian/patches/0004-Include-CPPFLAGS-in-CFLAGS.patch
new file mode 100644
index 0000000..800c5bc
--- /dev/null
+++ b/debian/patches/0004-Include-CPPFLAGS-in-CFLAGS.patch
@@ -0,0 +1,29 @@
+From: Kevin Murray <spam at kdmurray.id.au>
+Date: Mon, 19 Oct 2015 11:25:14 +1100
+Subject: Include CPPFLAGS in CFLAGS
+
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1c98cce..547be78 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,6 @@
+ PROGRAM_NAME = scythe
+ VERSION ="$(shell dpkg-parsechangelog | grep '^Version:' | cut -f 2 -d ' ')"
+-CC = gcc
++CC ?= gcc
+ DEBUG ?= 0
+ ifeq ($(DEBUG), 1)
+ 	CFLAGS += -g -O0
+@@ -9,7 +9,7 @@ else
+ endif
+ 
+ ARCHIVE = $(PROGRAM_NAME)_$(VERSION)
+-override CFLAGS += -Wall -pedantic -DVERSION=$(VERSION) -std=gnu99 -fPIC
++override CFLAGS += $(CPPFLAGS) -Wall -pedantic -DVERSION=$(VERSION) -std=gnu99 -fPIC
+ override LDFLAGS += -lz -lm
+ LDTESTFLAGS = -lcheck
+ SDIR = src
diff --git a/debian/patches/series b/debian/patches/series
index 9530a50..52103e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Makefile-cleaning-for-debian.patch
 0002-Fix-typos-in-binary.patch
 0003-Get-package-version-from-dpkg-parsechangelog.patch
+0004-Include-CPPFLAGS-in-CFLAGS.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/scythe.git