From 41e07d3d15b9571cc71c811652569604862ed106 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 16 Jun 2022 00:46:21 -0700 Subject: [PATCH 1/6] [hiredis] Fix the conflict of macro ssize_t --- ports/hiredis/portfile.cmake | 20 +++++++++++++++++++- ports/hiredis/vcpkg.json | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ports/hiredis/portfile.cmake b/ports/hiredis/portfile.cmake index 6e7e0937d3adac..77a85cb3777558 100644 --- a/ports/hiredis/portfile.cmake +++ b/ports/hiredis/portfile.cmake @@ -33,11 +33,29 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_cmake_config_fixup() if("ssl" IN_LIST FEATURES) vcpkg_cmake_config_fixup(PACKAGE_NAME hiredis_ssl CONFIG_PATH share/hiredis_ssl) endif() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/hiredis/hiredis.h" +[[typedef long long ssize_t; +#define _SSIZE_T_ /* for compatibility with libuv */]] +[[#if !defined(_SSIZE_T_) && !defined(_SSIZE_T_DEFINED) +typedef long long ssize_t; +#define _SSIZE_T_ /* for compatibility with libuv */ +#endif]] +) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/hiredis/sds.h" +[[typedef long long ssize_t; +#define SSIZE_MAX (LLONG_MAX >> 1)]] +[[#if !defined(_SSIZE_T_) && !defined(_SSIZE_T_DEFINED) +typedef long long ssize_t; +#define SSIZE_MAX (LLONG_MAX >> 1) +#endif]] +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/hiredis/vcpkg.json b/ports/hiredis/vcpkg.json index 48379f488c24b6..942bcc058874ad 100644 --- a/ports/hiredis/vcpkg.json +++ b/ports/hiredis/vcpkg.json @@ -1,7 +1,7 @@ { "name": "hiredis", "version": "1.0.2", - "port-version": 3, + "port-version": 4, "description": "Hiredis is a minimalistic C client library for the Redis database.", "homepage": "https://github.com/redis/hiredis", "dependencies": [ From fb822ddc5af88881405f1336c9b70af803e157de Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 16 Jun 2022 00:46:56 -0700 Subject: [PATCH 2/6] version --- 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 cfa3bcaa6040df..e4dabeca90924d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2810,7 +2810,7 @@ }, "hiredis": { "baseline": "1.0.2", - "port-version": 3 + "port-version": 4 }, "hps": { "baseline": "2022-01-18", diff --git a/versions/h-/hiredis.json b/versions/h-/hiredis.json index 36c7df6bef130f..d641b891a7afc0 100644 --- a/versions/h-/hiredis.json +++ b/versions/h-/hiredis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "61a9442976602c2c980a40ee0ac3206a43bfd748", + "version": "1.0.2", + "port-version": 4 + }, { "git-tree": "4eafe5d23a2d906153cc8821c14092f2a9d3ef8a", "version": "1.0.2", From 50216ba1630c54fe9235b489f7f51d739041e57c Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 16 Jun 2022 02:52:13 -0700 Subject: [PATCH 3/6] Add license --- ports/hiredis/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/hiredis/vcpkg.json b/ports/hiredis/vcpkg.json index 942bcc058874ad..b8cbfc8e4f97b6 100644 --- a/ports/hiredis/vcpkg.json +++ b/ports/hiredis/vcpkg.json @@ -4,6 +4,7 @@ "port-version": 4, "description": "Hiredis is a minimalistic C client library for the Redis database.", "homepage": "https://github.com/redis/hiredis", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", From 84e482689db61817a7dfa6572e66ff2f2f3d0f2c Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 16 Jun 2022 02:52:23 -0700 Subject: [PATCH 4/6] version --- versions/h-/hiredis.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/h-/hiredis.json b/versions/h-/hiredis.json index d641b891a7afc0..79ffe721a83200 100644 --- a/versions/h-/hiredis.json +++ b/versions/h-/hiredis.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "61a9442976602c2c980a40ee0ac3206a43bfd748", + "git-tree": "f7763af93472b87cd743ed95d74f0d4a4361a700", "version": "1.0.2", "port-version": 4 }, From 15a25d975b63b4d1f997bc3aad9913b5f5f96422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 8 Jul 2022 14:34:42 +0800 Subject: [PATCH 5/6] Update ports/hiredis/portfile.cmake Co-authored-by: Billy O'Neal --- ports/hiredis/portfile.cmake | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/ports/hiredis/portfile.cmake b/ports/hiredis/portfile.cmake index 77a85cb3777558..0eb8f9b566f460 100644 --- a/ports/hiredis/portfile.cmake +++ b/ports/hiredis/portfile.cmake @@ -41,18 +41,13 @@ endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/hiredis/hiredis.h" [[typedef long long ssize_t; #define _SSIZE_T_ /* for compatibility with libuv */]] -[[#if !defined(_SSIZE_T_) && !defined(_SSIZE_T_DEFINED) -typedef long long ssize_t; -#define _SSIZE_T_ /* for compatibility with libuv */ -#endif]] +[[typedef intptr_t ssize_t;]] ) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/hiredis/sds.h" [[typedef long long ssize_t; #define SSIZE_MAX (LLONG_MAX >> 1)]] -[[#if !defined(_SSIZE_T_) && !defined(_SSIZE_T_DEFINED) -typedef long long ssize_t; -#define SSIZE_MAX (LLONG_MAX >> 1) -#endif]] +[[typedef intptr_t ssize_t; +#define SSIZE_MAX INTPTR_MAX]] ) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") From 0199278a547ed2d44f556ff3a2051b4f1beee48e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 8 Jul 2022 14:35:43 +0800 Subject: [PATCH 6/6] Update versions/h-/hiredis.json --- versions/h-/hiredis.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/h-/hiredis.json b/versions/h-/hiredis.json index 79ffe721a83200..2c59b0b7f0774c 100644 --- a/versions/h-/hiredis.json +++ b/versions/h-/hiredis.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f7763af93472b87cd743ed95d74f0d4a4361a700", + "git-tree": "448374fa990c04aa7964508d32817a6d7868600b", "version": "1.0.2", "port-version": 4 },