From 56cb5752aef0fd86e8a8638f948a5eecb58bbff3 Mon Sep 17 00:00:00 2001 From: Vitaly Petrov Date: Wed, 15 Dec 2021 20:22:16 +0300 Subject: [PATCH 1/2] [hiredis] Fix static build --- ports/hiredis/portfile.cmake | 4 ++-- .../{support-static-in-win.patch => support-static.patch} | 0 ports/hiredis/vcpkg.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename ports/hiredis/{support-static-in-win.patch => support-static.patch} (100%) diff --git a/ports/hiredis/portfile.cmake b/ports/hiredis/portfile.cmake index 7c1da46ada96d5..6e7e0937d3adac 100644 --- a/ports/hiredis/portfile.cmake +++ b/ports/hiredis/portfile.cmake @@ -1,5 +1,5 @@ -if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(HIREDIS_PATCHES support-static-in-win.patch) +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(HIREDIS_PATCHES support-static.patch) endif() vcpkg_from_github( diff --git a/ports/hiredis/support-static-in-win.patch b/ports/hiredis/support-static.patch similarity index 100% rename from ports/hiredis/support-static-in-win.patch rename to ports/hiredis/support-static.patch diff --git a/ports/hiredis/vcpkg.json b/ports/hiredis/vcpkg.json index aee055198b080a..48379f488c24b6 100644 --- a/ports/hiredis/vcpkg.json +++ b/ports/hiredis/vcpkg.json @@ -1,7 +1,7 @@ { "name": "hiredis", "version": "1.0.2", - "port-version": 2, + "port-version": 3, "description": "Hiredis is a minimalistic C client library for the Redis database.", "homepage": "https://github.com/redis/hiredis", "dependencies": [ From 0b29dbbc750f6900e94d4275aa714fd10c5162a5 Mon Sep 17 00:00:00 2001 From: Vitaly Petrov Date: Wed, 15 Dec 2021 20:23:25 +0300 Subject: [PATCH 2/2] Update version database --- versions/baseline.json | 2 +- versions/h-/hiredis.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 2a6b1334000980..6018af00d33172 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2698,7 +2698,7 @@ }, "hiredis": { "baseline": "1.0.2", - "port-version": 2 + "port-version": 3 }, "hpx": { "baseline": "1.7.1", diff --git a/versions/h-/hiredis.json b/versions/h-/hiredis.json index 0821aee51a1bb4..36c7df6bef130f 100644 --- a/versions/h-/hiredis.json +++ b/versions/h-/hiredis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4eafe5d23a2d906153cc8821c14092f2a9d3ef8a", + "version": "1.0.2", + "port-version": 3 + }, { "git-tree": "b651b36e6488f1eaaafc33d15d73d94751919f03", "version": "1.0.2",