Author: Guillaume Delacour <gui@iroqwa.org>
Subject: Add CPPFLAGS in upstream makefiles
Last-Update: 2014-09-05

Index: redis-2.8.13/src/Makefile
===================================================================
--- redis-2.8.13.orig/src/Makefile
+++ redis-2.8.13/src/Makefile
@@ -87,7 +87,7 @@ ifeq ($(MALLOC),jemalloc)
 	FINAL_LIBS+= -ljemalloc
 endif
 
-REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
+REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) $(CPPFLAGS)
 REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
 REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
 
Index: redis-2.8.13/deps/linenoise/Makefile
===================================================================
--- redis-2.8.13.orig/deps/linenoise/Makefile
+++ redis-2.8.13/deps/linenoise/Makefile
@@ -6,7 +6,7 @@ R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG)
 R_LDFLAGS= $(LDFLAGS)
 DEBUG= -g
 
-R_CC=$(CC) $(R_CFLAGS)
+R_CC=$(CC) $(R_CFLAGS) $(CPPFLAGS)
 R_LD=$(CC) $(R_LDFLAGS)
 
 linenoise.o: linenoise.h linenoise.c
Index: redis-2.8.13/deps/hiredis/Makefile
===================================================================
--- redis-2.8.13.orig/deps/hiredis/Makefile
+++ redis-2.8.13/deps/hiredis/Makefile
@@ -28,7 +28,7 @@ CC:=$(shell sh -c 'type $(CC) >/dev/null
 OPTIMIZATION?=-O3
 WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
 DEBUG?= -g -ggdb
-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH)
+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH) $(CPPFLAGS)
 REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
 
 DYLIBSUFFIX=so