mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-07 05:10:20 +00:00
redis: upgrade 7.0.12 -> 7.2.0
hiredis-use-default-CC-if-it-is-set.patch oe-use-libc-malloc.patch refreshed for 7.2.0 Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+4
-6
@@ -1,4 +1,4 @@
|
|||||||
From 9da2d12c9fabfff4b4460accf887658db89687e4 Mon Sep 17 00:00:00 2001
|
From 41efa2f0cf08c91ff935bbb2d16ab233df7f5811 Mon Sep 17 00:00:00 2001
|
||||||
From: Venture Research <tech@ventureresearch.com>
|
From: Venture Research <tech@ventureresearch.com>
|
||||||
Date: Fri, 8 Feb 2013 17:39:52 -0600
|
Date: Fri, 8 Feb 2013 17:39:52 -0600
|
||||||
Subject: [PATCH] hiredis: use default CC if it is set
|
Subject: [PATCH] hiredis: use default CC if it is set
|
||||||
@@ -18,21 +18,19 @@ Reworked for 6.0.4
|
|||||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||||
|
|
||||||
---
|
---
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
deps/hiredis/Makefile | 2 --
|
deps/hiredis/Makefile | 2 --
|
||||||
1 file changed, 2 deletions(-)
|
1 file changed, 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile
|
diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile
|
||||||
index 7e41c97..54717e3 100644
|
index bd2106b..9ce768d 100644
|
||||||
--- a/deps/hiredis/Makefile
|
--- a/deps/hiredis/Makefile
|
||||||
+++ b/deps/hiredis/Makefile
|
+++ b/deps/hiredis/Makefile
|
||||||
@@ -42,8 +42,6 @@ endef
|
@@ -36,8 +36,6 @@ endef
|
||||||
export REDIS_TEST_CONFIG
|
export REDIS_TEST_CONFIG
|
||||||
|
|
||||||
# Fallback to gcc when $CC is not in $PATH.
|
# 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++')
|
-CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
|
||||||
OPTIMIZATION?=-O3
|
OPTIMIZATION?=-O3
|
||||||
WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
|
WARNINGS=-Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
|
||||||
DEBUG_FLAGS?= -g -ggdb
|
DEBUG_FLAGS?= -g -ggdb
|
||||||
+4
-6
@@ -1,4 +1,4 @@
|
|||||||
From 88da6b19ecd00747769663e913aba5e9569c489d Mon Sep 17 00:00:00 2001
|
From 38a5f403b033d03cdac3ff814687d83f61527d8e Mon Sep 17 00:00:00 2001
|
||||||
From: Venture Research <tech@ventureresearch.com>
|
From: Venture Research <tech@ventureresearch.com>
|
||||||
Date: Wed, 6 Feb 2013 20:51:02 -0600
|
Date: Wed, 6 Feb 2013 20:51:02 -0600
|
||||||
Subject: [PATCH] hack to force use of libc malloc
|
Subject: [PATCH] hack to force use of libc malloc
|
||||||
@@ -15,13 +15,11 @@ Update to work with 4.0.8
|
|||||||
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
|
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
|
||||||
|
|
||||||
---
|
---
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
src/Makefile | 3 ++-
|
src/Makefile | 3 ++-
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/src/Makefile b/src/Makefile
|
diff --git a/src/Makefile b/src/Makefile
|
||||||
index 2a0d74d..ddabd44 100644
|
index ecbd275..39decee 100644
|
||||||
--- a/src/Makefile
|
--- a/src/Makefile
|
||||||
+++ b/src/Makefile
|
+++ b/src/Makefile
|
||||||
@@ -13,7 +13,8 @@
|
@@ -13,7 +13,8 @@
|
||||||
@@ -32,5 +30,5 @@ index 2a0d74d..ddabd44 100644
|
|||||||
+# use fake uname option to force use of generic libc
|
+# use fake uname option to force use of generic libc
|
||||||
+uname_S := "USE_LIBC_MALLOC"
|
+uname_S := "USE_LIBC_MALLOC"
|
||||||
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
|
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
|
||||||
OPTIMIZATION?=-O2
|
CLANG := $(findstring clang,$(shell sh -c '$(CC) --version | head -1'))
|
||||||
DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram
|
OPTIMIZATION?=-O3
|
||||||
+1
-1
@@ -17,7 +17,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
|
|||||||
file://GNU_SOURCE-7.patch \
|
file://GNU_SOURCE-7.patch \
|
||||||
file://0006-Define-correct-gregs-for-RISCV32.patch \
|
file://0006-Define-correct-gregs-for-RISCV32.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[sha256sum] = "9dd83d5b278bb2bf0e39bfeb75c3e8170024edbaf11ba13b7037b2945cf48ab7"
|
SRC_URI[sha256sum] = "8b12e242647635b419a0e1833eda02b65bf64e39eb9e509d9db4888fb3124943"
|
||||||
|
|
||||||
inherit autotools-brokensep update-rc.d systemd useradd
|
inherit autotools-brokensep update-rc.d systemd useradd
|
||||||
|
|
||||||
Reference in New Issue
Block a user