From df6d91cfc4fd9e57a4fe1156f4d5830c600b13b2 Mon Sep 17 00:00:00 2001 From: Peter Bergin Date: Tue, 23 May 2023 14:12:30 +0200 Subject: redis-plus-plus: uprev to 1.3.8 Removed patch now applied upstream. Signed-off-by: Peter Bergin Signed-off-by: Peter Bergin Signed-off-by: Khem Raj --- .../files/0001-include-cstdint.patch | 37 ---------------------- .../redis-plus-plus/redis-plus-plus_1.3.7.bb | 27 ---------------- .../redis-plus-plus/redis-plus-plus_1.3.8.bb | 26 +++++++++++++++ 3 files changed, 26 insertions(+), 64 deletions(-) delete mode 100644 meta-oe/recipes-extended/redis-plus-plus/files/0001-include-cstdint.patch delete mode 100644 meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.7.bb create mode 100644 meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.8.bb 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 -Date: Wed, 25 Jan 2023 20:40:56 -0800 -Subject: [PATCH] include - -gcc 13 libstdc++ moved some includes around and as a result -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 ---- - 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 - #include - #include - #include --- -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.7.bb deleted file mode 100644 index 3a1eec8b1c..0000000000 --- a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.7.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "C++ client for Redis based on hiredis" -HOMEPAGE = "https://github.com/sewenew/redis-plus-plus" -SECTION = "libs" -LICENSE = "Apache-2.0" -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" - -S = "${WORKDIR}/git" - -inherit cmake - -# if ssl is enabled for redis-plus-plus it must also be enabled for hiredis -PACKAGECONFIG ??= "ssl" -PACKAGECONFIG[ssl] = "-DREDIS_PLUS_PLUS_USE_TLS=ON, -DREDIS_PLUS_PLUS_USE_TLS=OFF, openssl" -PACKAGECONFIG[test] = "-DREDIS_PLUS_PLUS_BUILD_TEST=ON, -DREDIS_PLUS_PLUS_BUILD_TEST=OFF" - -do_install:append() { - # To remove absolute path in .cmake found by QA warning [buildpaths] - sed -i -e 's|${STAGING_LIBDIR}/libcrypto.so|crypto|g' ${D}${datadir}/cmake/redis++/redis++-targets.cmake - sed -i -e 's|${STAGING_LIBDIR}/libssl.so|ssl|g' ${D}${datadir}/cmake/redis++/redis++-targets.cmake -} diff --git a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.8.bb b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.8.bb new file mode 100644 index 0000000000..bea1f0b18c --- /dev/null +++ b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.8.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "C++ client for Redis based on hiredis" +HOMEPAGE = "https://github.com/sewenew/redis-plus-plus" +SECTION = "libs" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +DEPENDS += "hiredis" + +SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https \ + file://0001-CMakeLists.txt-fix-substitution-for-static-libs.patch" +SRCREV = "4368319fb668204f345da05b9dd79762506c67b6" + +S = "${WORKDIR}/git" + +inherit cmake + +# if ssl is enabled for redis-plus-plus it must also be enabled for hiredis +PACKAGECONFIG ??= "ssl" +PACKAGECONFIG[ssl] = "-DREDIS_PLUS_PLUS_USE_TLS=ON, -DREDIS_PLUS_PLUS_USE_TLS=OFF, openssl" +PACKAGECONFIG[test] = "-DREDIS_PLUS_PLUS_BUILD_TEST=ON, -DREDIS_PLUS_PLUS_BUILD_TEST=OFF" + +do_install:append() { + # To remove absolute path in .cmake found by QA warning [buildpaths] + sed -i -e 's|${STAGING_LIBDIR}/libcrypto.so|crypto|g' ${D}${datadir}/cmake/redis++/redis++-targets.cmake + sed -i -e 's|${STAGING_LIBDIR}/libssl.so|ssl|g' ${D}${datadir}/cmake/redis++/redis++-targets.cmake +} -- cgit v1.2.3-54-g00ecf