forked from openembedded/meta-openembedded
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 <[email protected]> Signed-off-by: Khem Raj <[email protected]>
- Loading branch information
1 parent
ed6e34b
commit 22d1293
Showing
2 changed files
with
8 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,26 +17,26 @@ Upstream-Status: Submitted [https://github.com/sewenew/redis-plus-plus/issues/48 | |
|
||
Signed-off-by: Peter Bergin <[email protected]> | ||
--- | ||
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) | ||
- string(REPLACE "hiredis::hiredis" "hiredis::hiredis_static" REDIS_PLUS_PLUS_HIREDIS_LIBS_STATIC | ||
+ 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() | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters