diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 17:31:02 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 17:31:02 +0000 |
| commit | 3f0e321b489e2eb1de700d20b850d5a43aecf769 (patch) | |
| tree | 2e1bf6a66273dce009ed7f1f08dfb5bb9424bc80 /debian/patches/0002-Add-CPPFLAGS-to-upstream-makefiles.patch | |
| parent | Adding upstream version 5:7.0.15. (diff) | |
| download | redis-debian.tar.xz redis-debian.zip | |
Adding debian version 5:7.0.15-1~deb12u1.debian/5%7.0.15-1_deb12u1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | debian/patches/0002-Add-CPPFLAGS-to-upstream-makefiles.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/debian/patches/0002-Add-CPPFLAGS-to-upstream-makefiles.patch b/debian/patches/0002-Add-CPPFLAGS-to-upstream-makefiles.patch new file mode 100644 index 0000000..0130606 --- /dev/null +++ b/debian/patches/0002-Add-CPPFLAGS-to-upstream-makefiles.patch @@ -0,0 +1,49 @@ +From: Chris Lamb <lamby@debian.org> +Date: Fri, 30 Oct 2015 10:53:42 +0000 +Subject: Add CPPFLAGS to upstream makefiles + +--- + deps/hdr_histogram/Makefile | 2 +- + deps/linenoise/Makefile | 2 +- + src/Makefile | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/deps/hdr_histogram/Makefile b/deps/hdr_histogram/Makefile +index 28dd93e..3a6413e 100644 +--- a/deps/hdr_histogram/Makefile ++++ b/deps/hdr_histogram/Makefile +@@ -2,7 +2,7 @@ STD= -std=c99 + WARN= -Wall + OPT= -Os + +-R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) -DHDR_MALLOC_INCLUDE=\"hdr_redis_malloc.h\" ++R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(CPPFLAGS) -DHDR_MALLOC_INCLUDE=\"hdr_redis_malloc.h\" + R_LDFLAGS= $(LDFLAGS) + DEBUG= -g + +diff --git a/deps/linenoise/Makefile b/deps/linenoise/Makefile +index 1dd894b..12ada21 100644 +--- a/deps/linenoise/Makefile ++++ b/deps/linenoise/Makefile +@@ -6,7 +6,7 @@ R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) + 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 +diff --git a/src/Makefile b/src/Makefile +index e4f7d90..391fdbc 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -296,7 +296,7 @@ else + endef + 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) + |