diff options
| author | Wang Mingyu <wangmy@fujitsu.com> | 2023-06-19 14:48:09 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2023-06-19 10:24:49 -0700 |
| commit | 22d1293154109478b892d05189ac3fef6014d84c (patch) | |
| tree | 45473a321bfe637aa17012f55940fbf2c4213862 | |
| parent | ed6e34b005f05992e29a4e2a6d3d2b139bfb10a9 (diff) | |
| download | meta-openembedded-22d1293154109478b892d05189ac3fef6014d84c.tar.gz | |
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 <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-extended/redis-plus-plus/files/0001-CMakeLists.txt-fix-substitution-for-static-libs.patch | 14 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.9.bb (renamed from meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.8.bb) | 2 |
2 files changed, 8 insertions, 8 deletions
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 | |||
| 17 | 17 | ||
| 18 | Signed-off-by: Peter Bergin <peter.bergin@windriver.com> | 18 | Signed-off-by: Peter Bergin <peter.bergin@windriver.com> |
| 19 | --- | 19 | --- |
| 20 | CMakeLists.txt | 5 ++--- | 20 | CMakeLists.txt | 4 ++-- |
| 21 | 1 file changed, 2 insertions(+), 3 deletions(-) | 21 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 22 | 22 | ||
| 23 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 23 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 24 | index 69794d9..08c265d 100644 | 24 | index 23a1840..5478271 100644 |
| 25 | --- a/CMakeLists.txt | 25 | --- a/CMakeLists.txt |
| 26 | +++ b/CMakeLists.txt | 26 | +++ b/CMakeLists.txt |
| 27 | @@ -160,13 +160,12 @@ if(REDIS_PLUS_PLUS_BUILD_STATIC) | 27 | @@ -184,13 +184,13 @@ if(REDIS_PLUS_PLUS_BUILD_STATIC) |
| 28 | set(REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC ${REDIS_PLUS_PLUS_HIREDIS_LIBS}) | 28 | set(REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC ${REDIS_PLUS_PLUS_HIREDIS_LIBS}) |
| 29 | 29 | ||
| 30 | if (TARGET hiredis::hiredis_static) | 30 | if (TARGET hiredis::hiredis_static) |
| @@ -32,11 +32,11 @@ index 69794d9..08c265d 100644 | |||
| 32 | + string(REPLACE "hiredis::hiredis;" "hiredis::hiredis_static;" REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC | 32 | + string(REPLACE "hiredis::hiredis;" "hiredis::hiredis_static;" REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC |
| 33 | "${REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC}") | 33 | "${REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC}") |
| 34 | endif() | 34 | endif() |
| 35 | - | 35 | |
| 36 | if (TARGET hiredis::hiredis_ssl_static) | 36 | if (TARGET hiredis::hiredis_ssl_static) |
| 37 | # If SSL is not enabled, this line will have no effect | 37 | # If SSL is not enabled, this line will have no effect |
| 38 | - string(REPLACE "hiredis::hiredis_ssl" "hiredis::hiredis_ssl_static" REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC | 38 | - string(REPLACE "hiredis::hiredis_static_ssl" "hiredis::hiredis_ssl_static" REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC |
| 39 | + string(REPLACE "hiredis::hiredis_ssl;" "hiredis::hiredis_ssl_static;" REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC | 39 | + string(REPLACE "hiredis::hiredis_static_ssl;" "hiredis::hiredis_ssl_static;" REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC |
| 40 | "${REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC}") | 40 | "${REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC}") |
| 41 | endif() | 41 | endif() |
| 42 | 42 | ||
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.9.bb index bea1f0b18c..a8a93868e8 100644 --- 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.9.bb | |||
| @@ -8,7 +8,7 @@ DEPENDS += "hiredis" | |||
| 8 | 8 | ||
| 9 | SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https \ | 9 | SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https \ |
| 10 | file://0001-CMakeLists.txt-fix-substitution-for-static-libs.patch" | 10 | file://0001-CMakeLists.txt-fix-substitution-for-static-libs.patch" |
| 11 | SRCREV = "4368319fb668204f345da05b9dd79762506c67b6" | 11 | SRCREV = "0c4ba0370e46c3d0d443c0368d02195faa791219" |
| 12 | 12 | ||
| 13 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
| 14 | 14 | ||
