aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Bergin <peter.bergin@windriver.com>2023-05-23 14:12:30 +0200
committerKhem Raj <raj.khem@gmail.com>2023-05-23 15:04:38 -0700
commitdf6d91cfc4fd9e57a4fe1156f4d5830c600b13b2 (patch)
tree82bc8f0e948ac06a775881e71f4ff288e2092ddd
parent48297a8f75b9d7b507ab90058dd5de286722bce6 (diff)
downloadmeta-openembedded-df6d91cfc4fd9e57a4fe1156f4d5830c600b13b2.tar.gz
redis-plus-plus: uprev to 1.3.8
Removed patch now applied upstream. Signed-off-by: Peter Bergin <peter.bergin@windriver.com> Signed-off-by: Peter Bergin <peter@berginkonsult.se> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-extended/redis-plus-plus/files/0001-include-cstdint.patch37
-rw-r--r--meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.8.bb (renamed from meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.7.bb)3
2 files changed, 1 insertions, 39 deletions
diff --git a/meta-oe/recipes-extended/redis-plus-plus/files/0001-include-cstdint.patch b/meta-oe/recipes-extended/redis-plus-plus/files/0001-include-cstdint.patch
deleted file mode 100644
index bfe2412b5d..0000000000
--- a/meta-oe/recipes-extended/redis-plus-plus/files/0001-include-cstdint.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e74bb5a7ef87e697571181280e6108b89104c02d Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 25 Jan 2023 20:40:56 -0800
-Subject: [PATCH] include <cstdint>
-
-gcc 13 libstdc++ moved some includes around and as a result <cstdint>
-is no longer transitively included [1]. Explicitly include it for uintXX_t.
-
-Fixes
-
-../git/src/sw/redis++/utils.h:187:1: error: 'uint16_t' does not name a type
- 187 | uint16_t crc16(const char *buf, int len);
- | ^~~~~~~~
-
-[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
-
-Upstream-Status: Submitted [https://github.com/sewenew/redis-plus-plus/pull/449]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/sw/redis++/utils.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/sw/redis++/utils.h b/src/sw/redis++/utils.h
-index f77f796..ff38f2d 100644
---- a/src/sw/redis++/utils.h
-+++ b/src/sw/redis++/utils.h
-@@ -17,6 +17,7 @@
- #ifndef SEWENEW_REDISPLUSPLUS_UTILS_H
- #define SEWENEW_REDISPLUSPLUS_UTILS_H
-
-+#include <cstdint>
- #include <cstring>
- #include <string>
- #include <type_traits>
---
-2.39.1
-
diff --git a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.7.bb b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.8.bb
index 3a1eec8b1c..bea1f0b18c 100644
--- a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.7.bb
+++ b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.8.bb
@@ -7,9 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
DEPENDS += "hiredis"
SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https \
- file://0001-include-cstdint.patch \
file://0001-CMakeLists.txt-fix-substitution-for-static-libs.patch"
-SRCREV = "f3b19a8a1f609d1a1b79002802e5cf8c336dc262"
+SRCREV = "4368319fb668204f345da05b9dd79762506c67b6"
S = "${WORKDIR}/git"