From 9500cb0a9b88aaf485339f249c1210e333d678ce Mon Sep 17 00:00:00 2001 From: Tal Regev Date: Wed, 7 Aug 2024 00:30:47 +0300 Subject: [PATCH] add # ifndef ssize_t --- ports/libuv/portfile.cmake | 4 +++- ports/libuv/ssize_t.patch | 14 ++++++++++++++ ports/libuv/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libuv.json | 5 +++++ 5 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 ports/libuv/ssize_t.patch diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake index 1e8e500e57d48d..abc590c016dac6 100644 --- a/ports/libuv/portfile.cmake +++ b/ports/libuv/portfile.cmake @@ -4,7 +4,9 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 81a9580bc51c22385de4dab748968477b5e552aa25f901c376e3ffac624e0e05362b48239222e826cad900329f9a7cbdb080794fb4ada9ca14196efc2969cc57 HEAD_REF v1.x - PATCHES fix-build-type.patch + PATCHES + fix-build-type.patch + ssize_t.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBUV_BUILD_SHARED) diff --git a/ports/libuv/ssize_t.patch b/ports/libuv/ssize_t.patch new file mode 100644 index 00000000000000..aae8d66e295155 --- /dev/null +++ b/ports/libuv/ssize_t.patch @@ -0,0 +1,14 @@ +diff --git a/include/uv/win.h b/include/uv/win.h +index 12ac53b4..6e1abd5b 100644 +--- a/include/uv/win.h ++++ b/include/uv/win.h +@@ -24,7 +24,9 @@ + #endif + + #if !defined(_SSIZE_T_) && !defined(_SSIZE_T_DEFINED) ++# ifndef ssize_t + typedef intptr_t ssize_t; ++# endif + # define SSIZE_MAX INTPTR_MAX + # define _SSIZE_T_ + # define _SSIZE_T_DEFINED diff --git a/ports/libuv/vcpkg.json b/ports/libuv/vcpkg.json index b25b72902e291b..951d28e6a2e24e 100644 --- a/ports/libuv/vcpkg.json +++ b/ports/libuv/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libuv", "version-semver": "1.48.0", + "port-version": 1, "description": "libuv is a multi-platform support library with a focus on asynchronous I/O.", "homepage": "https://github.com/libuv/libuv", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index e0ae82a6341718..a2dc7a084b57d5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5202,7 +5202,7 @@ }, "libuv": { "baseline": "1.48.0", - "port-version": 0 + "port-version": 1 }, "libuvc": { "baseline": "0.0.7", diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json index e284c556690e4b..e05e351e2b9d43 100644 --- a/versions/l-/libuv.json +++ b/versions/l-/libuv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9acba527010351e148700213675f5ed81fd2300e", + "version-semver": "1.48.0", + "port-version": 1 + }, { "git-tree": "eb297582074da541775cf29ad02a7dfe8a5a57e1", "version-semver": "1.48.0",