From: Ralf Jung <post@ralfj.de>
Date: Thu, 13 Sep 2012 17:00:55 +0000 (+0200)
Subject: use CPPFLAGS
X-Git-Tag: debian/1.3.2-1~18
X-Git-Url: https://git.ralfj.de/osspd.git/commitdiff_plain/8df2610192ae1f4b9776444841a465f5e6c92a69?ds=inline

use CPPFLAGS
---

diff --git a/debian/patches/0001-Fix-compilation-with-Werror-format-security.patch b/debian/patches/0001-Fix-compilation-with-Werror-format-security-use-CPPF.patch
similarity index 67%
rename from debian/patches/0001-Fix-compilation-with-Werror-format-security.patch
rename to debian/patches/0001-Fix-compilation-with-Werror-format-security-use-CPPF.patch
index d688de1..2fcf036 100644
--- a/debian/patches/0001-Fix-compilation-with-Werror-format-security.patch
+++ b/debian/patches/0001-Fix-compilation-with-Werror-format-security-use-CPPF.patch
@@ -1,12 +1,26 @@
 From: Ralf Jung <post@ralfj.de>
 Date: Thu, 13 Sep 2012 18:36:54 +0200
-Subject: Fix compilation with -Werror=format-security
+Subject: Fix compilation with -Werror=format-security, use CPPFLAGS
 
 ---
+ Makefile     |    2 +-
  ossp-slave.c |    4 ++--
  osspd.c      |    2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ 3 files changed, 4 insertions(+), 4 deletions(-)
 
+diff --git a/Makefile b/Makefile
+index 8111c9b..8d8fe87 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2,7 +2,7 @@
+ # DESTDIR is completely respected
+ CC := gcc
+ AR := ar
+-CFLAGS := -Wall $(CFLAGS)
++CFLAGS := -Wall $(CFLAGS) $(CPPFLAGS)
+ XLDFLAGS := $(LDFLAGS)
+ LDFLAGS := -L. -lossp $(LDFLAGS)
+ prefix := /usr/local
 diff --git a/ossp-slave.c b/ossp-slave.c
 index 4c5cb2d..a290636 100644
 --- a/ossp-slave.c
diff --git a/debian/patches/series b/debian/patches/series
index b4cc690..c9f5083 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-0001-Fix-compilation-with-Werror-format-security.patch
+0001-Fix-compilation-with-Werror-format-security-use-CPPF.patch