From 2a0b7b4aac6fd2561d9728dbc69ad02c4ec0f6ef Mon Sep 17 00:00:00 2001 From: Moritz Haase Date: Fri, 11 Jul 2025 12:00:21 +0200 Subject: redis-plus-plus: upgrade 1.3.11 -> 1.3.14 Additionally backport a patch to support to build against CMake 4+ that hasn't made it into a release yet. Release notes are available at [0]. [0]: https://github.com/sewenew/redis-plus-plus/releases Signed-off-by: Moritz Haase Signed-off-by: Khem Raj --- ...0001-update-cmake_minimum_required-to-3.5.patch | 34 ++++++++++++++++++++++ .../redis-plus-plus/redis-plus-plus_1.3.11.bb | 25 ---------------- .../redis-plus-plus/redis-plus-plus_1.3.14.bb | 25 ++++++++++++++++ 3 files changed, 59 insertions(+), 25 deletions(-) create mode 100644 meta-oe/recipes-extended/redis-plus-plus/files/0001-update-cmake_minimum_required-to-3.5.patch delete mode 100644 meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb create mode 100644 meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.14.bb diff --git a/meta-oe/recipes-extended/redis-plus-plus/files/0001-update-cmake_minimum_required-to-3.5.patch b/meta-oe/recipes-extended/redis-plus-plus/files/0001-update-cmake_minimum_required-to-3.5.patch new file mode 100644 index 0000000000..02093573ce --- /dev/null +++ b/meta-oe/recipes-extended/redis-plus-plus/files/0001-update-cmake_minimum_required-to-3.5.patch @@ -0,0 +1,34 @@ +From e30d4c4c557568b01d5adce9df2714de8d3921c2 Mon Sep 17 00:00:00 2001 +From: sewenew +Date: Tue, 15 Apr 2025 22:57:08 +0800 +Subject: [PATCH] update cmake_minimum_required to 3.5 + +Signed-off-by: Moritz Haase +Upstream-Status: Backport [e30d4c4c557568b01d5adce9df2714de8d3921c2] +--- + CMakeLists.txt | 2 +- + test/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e0a8cf4..9c742f9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.1) ++cmake_minimum_required(VERSION 3.5) + + function(GET_VERSION VERSION_PART VERSION_NUM) + set(VERSION_REGEX "^const int VERSION_${VERSION_PART} = (.+);$") +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 3423956..88aa079 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -1,6 +1,6 @@ + project(test_redis++) + +-cmake_minimum_required(VERSION 3.1) ++cmake_minimum_required(VERSION 3.5) + + set(REDIS_PLUS_PLUS_TEST_SOURCES src/sw/redis++/test_main.cpp) + diff --git a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb deleted file mode 100644 index d643c6f0b9..0000000000 --- a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb +++ /dev/null @@ -1,25 +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 = "ad6baa121f4c6fbc7622d83d606210ac22549c78" - - -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.14.bb b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.14.bb new file mode 100644 index 0000000000..19e68edea8 --- /dev/null +++ b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.14.bb @@ -0,0 +1,25 @@ +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;tag=${PV} \ + file://0001-update-cmake_minimum_required-to-3.5.patch" +SRCREV = "b13fcead60bdc03f9771da25715bb134be89aa2f" + + +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