Skip to content

[hiredis] Support windows dynamic build #21914

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

Merged
BillyONeal merged 2 commits into from
Dec 10, 2021
Merged

[hiredis] Support windows dynamic build #21914

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
a085f9e
[hiredis] Support windows dynamic build
Dec 8, 2021
83f2668
versopm
Dec 8, 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
9 changes: 5 additions & 4 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)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
set(HIREDIS_PATCHES support-static-in-win.patch)
endif()

vcpkg_from_github(
Expand All @@ -10,10 +10,10 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
fix-feature-example.patch
support-static-in-win.patch
fix-timeval.patch
fix-include-path.patch
fix-ssize_t.patch
${HIREDIS_PATCHES}
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand All @@ -31,6 +31,8 @@ vcpkg_cmake_install()

vcpkg_copy_pdbs()

vcpkg_fixup_pkgconfig()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
vcpkg_cmake_config_fixup()
if("ssl" IN_LIST FEATURES)
Expand All @@ -39,4 +41,3 @@ endif()

# Handle copyright
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_fixup_pkgconfig()
3 changes: 1 addition & 2 deletions ports/hiredis/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{
"name": "hiredis",
"version": "1.0.2",
"port-version": 1,
"port-version": 2,
"description": "Hiredis is a minimalistic C client library for the Redis database.",
"homepage": "https://github.com/redis/hiredis",
"supports": "!(windows & !static)",
"dependencies": [
{
"name": "vcpkg-cmake",
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": 1
"port-version": 2
},
"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": "b651b36e6488f1eaaafc33d15d73d94751919f03",
"version": "1.0.2",
"port-version": 2
},
{
"git-tree": "0c7e16c5c3a9f612e1b46f96be41389b8ba11e6a",
"version": "1.0.2",
Expand Down