diff options
Diffstat (limited to 'meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch')
| -rw-r--r-- | meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch index 421f306ded..d2a1b45e66 100644 --- a/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch +++ b/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch @@ -11,20 +11,27 @@ Signed-off-by: Venture Research <tech@ventureresearch.com> Update to work with 4.0.8 Signed-off-by: Alistair Francis <alistair.francis@wdc.com> +Reworked for 6.0.4 +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- - deps/hiredis/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) +Upstream-Status: Pending + + deps/hiredis/Makefile | 2 -- + 1 file changed, 2 deletions(-) diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile -index 9a4de836..271c06ba 100644 +index 25ac154..569f82b 100644 --- a/deps/hiredis/Makefile +++ b/deps/hiredis/Makefile -@@ -36,7 +36,7 @@ endef +@@ -42,8 +42,6 @@ endef export REDIS_TEST_CONFIG # Fallback to gcc when $CC is not in $PATH. --CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') -+CC?=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') - CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g++') +-CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') +-CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++') OPTIMIZATION?=-O3 - WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings + WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers + DEBUG_FLAGS?= -g -ggdb +-- +2.21.3 + |