Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[hiredis] Fix static build #22038

Merged
merged 2 commits into from
Dec 15, 2021
Merged

[hiredis] Fix static build #22038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56cb575
[hiredis] Fix static build
kafeg Dec 15, 2021
0b29dbb
Update version database
kafeg Dec 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ports/hiredis/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
0 ports/hiredis/support-static-in-win.patch → ports/hiredis/support-static.patch
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ports/hiredis/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2698,7 +2698,7 @@
},
"hiredis": {
"baseline": "1.0.2",
"port-version": 2
"port-version": 3
},
"hpx": {
"baseline": "1.7.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/h-/hiredis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4eafe5d23a2d906153cc8821c14092f2a9d3ef8a",
"version": "1.0.2",
"port-version": 3
},
{
"git-tree": "b651b36e6488f1eaaafc33d15d73d94751919f03",
"version": "1.0.2",
Expand Down