mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-15 16:07:26 +00:00
redis: upgrade 8.0.6 -> 8.8.0
Regenerate 0001-hiredis-use-default-CC and 0004-src-Do-not-reset-FINAL_LIBS so they apply without fuzz (patch-fuzz is a fatal QA error). Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
+2
-3
@@ -31,11 +31,10 @@ Signed-off-by: Eric Meyers <eric.meyers@arthrex.com>
|
|||||||
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 bd2106b..9ce768d 100644
|
|
||||||
--- a/deps/hiredis/Makefile
|
--- a/deps/hiredis/Makefile
|
||||||
+++ b/deps/hiredis/Makefile
|
+++ b/deps/hiredis/Makefile
|
||||||
@@ -36,8 +36,6 @@ endef
|
@@ -41,8 +41,6 @@
|
||||||
export REDIS_TEST_CONFIG
|
HIREDIS_LDFLAGS=
|
||||||
|
|
||||||
# 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')
|
||||||
+5
-5
@@ -23,12 +23,12 @@ diff --git a/src/Makefile b/src/Makefile
|
|||||||
index 5dbbefc..15fbe09 100644
|
index 5dbbefc..15fbe09 100644
|
||||||
--- a/src/Makefile
|
--- a/src/Makefile
|
||||||
+++ b/src/Makefile
|
+++ b/src/Makefile
|
||||||
@@ -131,7 +131,7 @@ endif
|
@@ -152,7 +152,7 @@ endif
|
||||||
|
|
||||||
FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
|
FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
|
||||||
FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(REDIS_LDFLAGS) $(DEBUG)
|
FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(REDIS_LDFLAGS) $(DEBUG)
|
||||||
-FINAL_LIBS=-lm -lstdc++
|
-FINAL_LIBS=-lm
|
||||||
+FINAL_LIBS+=-lm -lstdc++
|
+FINAL_LIBS+=-lm
|
||||||
DEBUG=-g -ggdb
|
DEBUG=-g -ggdb
|
||||||
|
|
||||||
# Linux ARM32 needs -latomic at linking time
|
# Linux ARM32 needs -latomic at linking time
|
||||||
+1
-1
@@ -16,7 +16,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
|
|||||||
file://0004-src-Do-not-reset-FINAL_LIBS.patch \
|
file://0004-src-Do-not-reset-FINAL_LIBS.patch \
|
||||||
file://0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch \
|
file://0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[sha256sum] = "6d0a9913887a4972536f9da226f1575859c34d86354129163260a5f9c6bd4229"
|
SRC_URI[sha256sum] = "88422181efb0c9c0abba332e3e391d409e1e13714b838931669235e5796f704b"
|
||||||
|
|
||||||
RPROVIDES:${PN} = "virtual-redis"
|
RPROVIDES:${PN} = "virtual-redis"
|
||||||
|
|
||||||
Reference in New Issue
Block a user