From 22d1293154109478b892d05189ac3fef6014d84c Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 19 Jun 2023 14:48:09 +0800 Subject: redis-plus-plus: upgrade 1.3.8 -> 1.3.9 0001-CMakeLists.txt-fix-substitution-for-static-libs.patch refresh for new version Changelog: =========== Fix async interface bug More built-in commands support for AsyncRedis Fix incorrect hiredis static lib dependency when building with TSL Breaking change: make HSET related methods return long long instead of bool Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...ists.txt-fix-substitution-for-static-libs.patch | 14 ++++++------ .../redis-plus-plus/redis-plus-plus_1.3.8.bb | 26 ---------------------- .../redis-plus-plus/redis-plus-plus_1.3.9.bb | 26 ++++++++++++++++++++++ 3 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.8.bb create mode 100644 meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.9.bb diff --git a/meta-oe/recipes-extended/redis-plus-plus/files/0001-CMakeLists.txt-fix-substitution-for-static-libs.patch b/meta-oe/recipes-extended/redis-plus-plus/files/0001-CMakeLists.txt-fix-substitution-for-static-libs.patch index 627b929b4d..b652e6bb78 100644 --- a/meta-oe/recipes-extended/redis-plus-plus/files/0001-CMakeLists.txt-fix-substitution-for-static-libs.patch +++ b/meta-oe/recipes-extended/redis-plus-plus/files/0001-CMakeLists.txt-fix-substitution-for-static-libs.patch @@ -17,14 +17,14 @@ Upstream-Status: Submitted [https://github.com/sewenew/redis-plus-plus/issues/48 Signed-off-by: Peter Bergin --- - CMakeLists.txt | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 69794d9..08c265d 100644 +index 23a1840..5478271 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -160,13 +160,12 @@ if(REDIS_PLUS_PLUS_BUILD_STATIC) +@@ -184,13 +184,13 @@ if(REDIS_PLUS_PLUS_BUILD_STATIC) set(REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC ${REDIS_PLUS_PLUS_HIREDIS_LIBS}) if (TARGET hiredis::hiredis_static) @@ -32,11 +32,11 @@ index 69794d9..08c265d 100644 + string(REPLACE "hiredis::hiredis;" "hiredis::hiredis_static;" REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC "${REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC}") endif() -- + if (TARGET hiredis::hiredis_ssl_static) # If SSL is not enabled, this line will have no effect -- string(REPLACE "hiredis::hiredis_ssl" "hiredis::hiredis_ssl_static" REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC -+ string(REPLACE "hiredis::hiredis_ssl;" "hiredis::hiredis_ssl_static;" REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC +- string(REPLACE "hiredis::hiredis_static_ssl" "hiredis::hiredis_ssl_static" REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC ++ string(REPLACE "hiredis::hiredis_static_ssl;" "hiredis::hiredis_ssl_static;" REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC "${REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC}") endif() 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 deleted file mode 100644 index bea1f0b18c..0000000000 --- a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.8.bb +++ /dev/null @@ -1,26 +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-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 -} diff --git a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.9.bb b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.9.bb new file mode 100644 index 0000000000..a8a93868e8 --- /dev/null +++ b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.9.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 = "0c4ba0370e46c3d0d443c0368d02195faa791219" + +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