From 20f85de001381fe3df9e951ee412639e6604ef9c Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Mon, 13 Sep 2021 18:44:22 -0300 Subject: [PATCH] [Libuv] Fix iOS Build (#20117) * Use MacOS (Darwin) source files for building iOS version * Update version * Update version Co-authored-by: Ahmed Yarub Hani Al Nuaimi --- ports/libuv/CMakeLists.txt | 2 +- ports/libuv/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libuv.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/libuv/CMakeLists.txt b/ports/libuv/CMakeLists.txt index d400b60ba7..7d2c38bdbb 100644 --- a/ports/libuv/CMakeLists.txt +++ b/ports/libuv/CMakeLists.txt @@ -55,7 +55,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsSt add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_WIN}) target_compile_definitions(libuv PRIVATE WIN32_LEAN_AND_MEAN "_WIN32_WINNT=0x0600") target_link_libraries(libuv PRIVATE iphlpapi psapi shell32 userenv ws2_32) -elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") +elseif(APPLE) add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_DARWIN}) elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_FREEBSD}) diff --git a/ports/libuv/vcpkg.json b/ports/libuv/vcpkg.json index 44b67b26cc..5033ece2a1 100644 --- a/ports/libuv/vcpkg.json +++ b/ports/libuv/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libuv", "version-semver": "1.42.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", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index f2b47b35e9..7b43aff300 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3806,7 +3806,7 @@ }, "libuv": { "baseline": "1.42.0", - "port-version": 0 + "port-version": 1 }, "libuvc": { "baseline": "2020-11-24", diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json index 2faee63522..349c657094 100644 --- a/versions/l-/libuv.json +++ b/versions/l-/libuv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41003bf038eb10b7fd29029954d42a05fb3c1a86", + "version-semver": "1.42.0", + "port-version": 1 + }, { "git-tree": "cf96a59d9d41035fe89515464b3f93bcb9b84f27", "version-semver": "1.42.0",