package/hiredis: bump to version 1.0.0
PATCH 1/1 package/hiredis: bump to version 1.0.0
- Use cmake which is available since version 1.0.0 and
https://github.com/redis/hiredis/commit/ead586a2cb7de8a17073a96704a4200d63a380e5
- Disable tests
- Add openssl optional dependency
https://github.com/redis/hiredis/blob/v1.0.0/CHANGELOG.md
--- ...1-CMakeLists.txt-do-not-force-SHARED.patch | 47 ++++++++++++++ package/hiredis/hiredis.hash | 2 +- package/hiredis/hiredis.mk | 65 +++---------------- 3 files changed, 57 insertions(+), 57 deletions(-) create mode 100644 package/hiredis/0001-CMakeLists.txt-do-not-force-SHARED.patch
package/hiredis/0001-CMakeLists.txt-do-not-force-SHARED.patch new file +47 -0
@@ -0,0 +1,47 @@ +From 0ce382c275b087e866517c003e565f8cc4855bdd Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +Date: Sat, 29 Aug 2020 23:19:26 +0200 +Subject: [PATCH] CMakeLists.txt: do not force SHARED + +Allow the user to build static libraries by removing SHARED from +ADD_LIBRARY calls. + +Here is an extract of +https://cmake.org/cmake/help/latest/command/add_library.html: + +"If no type is given explicitly the type is STATIC or SHARED based on +whether the current value of the variable BUILD_SHARED_LIBS is ON." + +Signed-off-by: Fabrice Fontaine <[email protected]> +[Upstream status: probably not upstreamable as is because it will +conflict with https://github.com/redis/hiredis/pull/851. So, this patch +will probably have to be reworked for 1.0.x] +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1beccc6..fed79fd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -40,7 +40,7 @@ IF(WIN32) + ADD_COMPILE_DEFINITIONS(_CRT_SECURE_NO_WARNINGS WIN32_LEAN_AND_MEAN) + ENDIF() + +-ADD_LIBRARY(hiredis SHARED ${hiredis_sources}) ++ADD_LIBRARY(hiredis ${hiredis_sources}) + + SET_TARGET_PROPERTIES(hiredis + PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE +@@ -97,7 +97,7 @@ IF(ENABLE_SSL) + FIND_PACKAGE(OpenSSL REQUIRED) + SET(hiredis_ssl_sources + ssl.c) +- ADD_LIBRARY(hiredis_ssl SHARED ++ ADD_LIBRARY(hiredis_ssl + ${hiredis_ssl_sources}) + + IF (APPLE) +-- +2.28.0 +
package/hiredis/hiredis.hash +1 -1
@@ -1,3 +1,3 @@ # Locally computed: -sha256 2663b2aed9fd430507e30fc5e63274ee40cdd1a296026e22eafd7d99b01c8913 hiredis-0.14.1.tar.gz +sha256 2a0b5fe5119ec973a0c1966bfc4bd7ed39dbce1cb6d749064af9121fe971936f hiredis-1.0.0.tar.gz sha256 dca05ce8fc87a8261783b4aed0deef8becc9350b6aa770bc714d0c1833b896eb COPYING
package/hiredis/hiredis.mk +9 -56
75 lines not on this page · raw message
Signature · 1 line
2.28.0
PATCH 1/1 package/hiredis: bump to version 1.0.0
Quoted 8 lines · On Sat, 29 Aug 2020 23:39:16 +0200 Fabrice Fontaine…
- Use cmake which is available since version 1.0.0 and
https://github.com/redis/hiredis/commit/ead586a2cb7de8a17073a96704a4200d63a380e5
- Disable tests
- Add openssl optional dependencyhttps://github.com/redis/hiredis/blob/v1.0.0/CHANGELOG.md
Signed-off-by Fabrice Fontaine <[email protected]>
Thanks Fabrice. Quick question: did you test a bit of the reverse dependencies of hiredis were still building fine after this update ?
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/hiredis: bump to version 1.0.0
Le dim. 30 ao?t 2020 ? 00:13, Thomas Petazzoni
<[email protected]> a ?crit :
Quoted 9 lines
Quoted 5 lines · On Sat, 29 Aug 2020 23:39:16 +0200 Fabrice Fontaine…
- Use cmake which is available since version 1.0.0 and
https://github.com/redis/hiredis/commit/ead586a2cb7de8a17073a96704a4200d63a380e5
- Disable tests
- Add openssl optional dependency
Quoted 6 lines
Quoted 3 lines
https://github.com/redis/hiredis/blob/v1.0.0/CHANGELOG.md
Signed-off-by Fabrice Fontaine <[email protected]>Thanks Fabrice. Quick question: did you test a bit of the reverse dependencies of hiredis were still building fine after this update ?
Yes, suricata, collectd and proftpd build fine.
Quoted 8 lines
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Best Regards,
Fabrice
Thomas Petazzoni
AppliedPATCH 1/1 package/hiredis: bump to version 1.0.0
In reply to Fabrice FontaineQuoted 7 lines · On Sat, 29 Aug 2020 23:39:16 +0200 Fabrice Fontaine…
- Use cmake which is available since version 1.0.0 and
https://github.com/redis/hiredis/commit/ead586a2cb7de8a17073a96704a4200d63a380e5
- Disable tests
- Add openssl optional dependency
Quoted 7 lines
Signed-off-by Fabrice Fontaine <[email protected]>--- ...1-CMakeLists.txt-do-not-force-SHARED.patch | 47 ++++++++++++++ package/hiredis/hiredis.hash | 2 +- package/hiredis/hiredis.mk | 65 +++---------------- 3 files changed, 57 insertions(+), 57 deletions(-) create mode 100644 package/hiredis/0001-CMakeLists.txt-do-not-force-SHARED.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com