aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>2020-03-11 07:57:03 +0800
committerGitHub <noreply@github.com>2020-03-10 16:57:03 -0700
commit2057f0339be11c8684d07e4db8bfd85eb78d1cd9 (patch)
treedbb8efcdb56fffd448cb3bf82a8d47bc1f890837
parenta31f11b467490b2fb5c0b41cb28167a6ec375f02 (diff)
downloadvcpkg-2057f0339be11c8684d07e4db8bfd85eb78d1cd9.tar.gz
vcpkg-2057f0339be11c8684d07e4db8bfd85eb78d1cd9.zip
[hiredis] Fix feature ssl (#10044)
-rw-r--r--ports/hiredis/CONTROL2
-rw-r--r--ports/hiredis/fix-timeval.patch16
-rw-r--r--ports/hiredis/portfile.cmake1
3 files changed, 18 insertions, 1 deletions
diff --git a/ports/hiredis/CONTROL b/ports/hiredis/CONTROL
index 67534fac3..0bb9cb9d9 100644
--- a/ports/hiredis/CONTROL
+++ b/ports/hiredis/CONTROL
@@ -1,5 +1,5 @@
Source: hiredis
-Version: 2019-11-2
+Version: 2019-11-2-1
Homepage: https://github.com/redis/hiredis
Description: Hiredis is a minimalistic C client library for the Redis database.
diff --git a/ports/hiredis/fix-timeval.patch b/ports/hiredis/fix-timeval.patch
new file mode 100644
index 000000000..f389de504
--- /dev/null
+++ b/ports/hiredis/fix-timeval.patch
@@ -0,0 +1,16 @@
+diff --git a/async_private.h b/async_private.h
+index d0133ae..7760b60 100644
+--- a/async_private.h
++++ b/async_private.h
+@@ -32,6 +32,11 @@
+ #ifndef __HIREDIS_ASYNC_PRIVATE_H
+ #define __HIREDIS_ASYNC_PRIVATE_H
+
++#ifdef _WIN32
++#include <time.h>
++#include <windows.h>
++#endif
++
+ #define _EL_ADD_READ(ctx) \
+ do { \
+ refreshTimeout(ctx); \
diff --git a/ports/hiredis/portfile.cmake b/ports/hiredis/portfile.cmake
index bcd8ba1e6..833d428ee 100644
--- a/ports/hiredis/portfile.cmake
+++ b/ports/hiredis/portfile.cmake
@@ -11,6 +11,7 @@ vcpkg_from_github(
PATCHES
fix-feature-example.patch
support-static-in-win.patch
+ fix-timeval.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS