Skip to content

Commit aed7ca4

Browse files
cjihrigBethGriggs
authored andcommittedMar 2, 2020
deps: upgrade to libuv 1.32.0
Notable changes: - `uv_tcp_close_reset()` has been added. - `uv_udp_set_source_membership()` has been added. - A double free in `uv_free_cpu_info()` on OpenBSD has been fixed. - Defined, but empty environment variables can now be read on Windows. - Several improvements to the cmake build process. - The `EILSEQ` error code is now mapped by libuv. PR-URL: #29508 Backport-PR-URL: #31969 Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 794abbc commit aed7ca4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1176
-251
lines changed
 

‎deps/uv/AUTHORS

+7
Original file line numberDiff line numberDiff line change
@@ -396,3 +396,10 @@ Nan Xiao <nan@chinadtrace.org>
396396
Ben Davies <kaiepi@outlook.com>
397397
Nhan Khong <knhana7@gmail.com>
398398
Crunkle <justcrunkle@hotmail.co.uk>
399+
Tomas Krizek <tomas.krizek@nic.cz>
400+
Konstantin Podsvirov <konstantin@podsvirov.pro>
401+
seny <arseny.vakhrushev@gmail.com>
402+
Vladimir Karnushin <v.karnushin@mail.ru>
403+
MaYuming <maym@appexnetworks.com>
404+
Eneas U de Queiroz <cotequeiroz@gmail.com>
405+
Daniel Hahler <git@thequod.de>

‎deps/uv/CMakeLists.txt

+13-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# TODO: determine CMAKE_SYSTEM_NAME on OS/390. Currently assumes "OS/390".
2-
cmake_minimum_required(VERSION 3.0)
2+
cmake_minimum_required(VERSION 2.8.12)
33
project(libuv)
44

55
if(MSVC)
@@ -116,6 +116,7 @@ set(uv_test_sources
116116
test/test-shutdown-eof.c
117117
test/test-shutdown-twice.c
118118
test/test-signal-multiple-loops.c
119+
test/test-signal-pending-on-close.c
119120
test/test-signal.c
120121
test/test-socket-buffer-size.c
121122
test/test-spawn.c
@@ -127,6 +128,7 @@ set(uv_test_sources
127128
test/test-tcp-close-accept.c
128129
test/test-tcp-close-while-connecting.c
129130
test/test-tcp-close.c
131+
test/test-tcp-close-reset.c
130132
test/test-tcp-connect-error-after-write.c
131133
test/test-tcp-connect-error.c
132134
test/test-tcp-connect-timeout.c
@@ -317,6 +319,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "OS/390")
317319
list(APPEND uv_defines _OPEN_MSGQ_EXT)
318320
list(APPEND uv_defines _OPEN_SYS_FILE_EXT)
319321
list(APPEND uv_defines _OPEN_SYS_IF_EXT)
322+
list(APPEND uv_defines _OPEN_SYS_SOCK_EXT3)
320323
list(APPEND uv_defines _OPEN_SYS_SOCK_IPV6)
321324
list(APPEND uv_defines _UNIX03_SOURCE)
322325
list(APPEND uv_defines _UNIX03_THREADS)
@@ -340,15 +343,17 @@ if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD|Linux|NetBSD|OpenBSD")
340343
endif()
341344

342345
add_library(uv SHARED ${uv_sources})
343-
target_compile_definitions(uv PRIVATE ${uv_defines} BUILDING_UV_SHARED=1)
346+
target_compile_definitions(uv
347+
INTERFACE USING_UV_SHARED=1
348+
PRIVATE ${uv_defines} BUILDING_UV_SHARED=1)
344349
target_compile_options(uv PRIVATE ${uv_cflags})
345-
target_include_directories(uv PRIVATE include src)
350+
target_include_directories(uv PUBLIC include PRIVATE src)
346351
target_link_libraries(uv ${uv_libraries})
347352

348353
add_library(uv_a STATIC ${uv_sources})
349354
target_compile_definitions(uv_a PRIVATE ${uv_defines})
350355
target_compile_options(uv_a PRIVATE ${uv_cflags})
351-
target_include_directories(uv_a PRIVATE include src)
356+
target_include_directories(uv_a PUBLIC include PRIVATE src)
352357
target_link_libraries(uv_a ${uv_libraries})
353358

354359
option(libuv_buildtests "Build the unit tests when BUILD_TESTING is enabled." ON)
@@ -360,15 +365,13 @@ if(BUILD_TESTING AND libuv_buildtests)
360365
target_compile_definitions(uv_run_tests
361366
PRIVATE ${uv_defines} USING_UV_SHARED=1)
362367
target_compile_options(uv_run_tests PRIVATE ${uv_cflags})
363-
target_include_directories(uv_run_tests PRIVATE include)
364368
target_link_libraries(uv_run_tests uv ${uv_test_libraries})
365369
add_test(NAME uv_test
366370
COMMAND uv_run_tests
367371
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
368372
add_executable(uv_run_tests_a ${uv_test_sources})
369373
target_compile_definitions(uv_run_tests_a PRIVATE ${uv_defines})
370374
target_compile_options(uv_run_tests_a PRIVATE ${uv_cflags})
371-
target_include_directories(uv_run_tests_a PRIVATE include)
372375
target_link_libraries(uv_run_tests_a uv_a ${uv_test_libraries})
373376
add_test(NAME uv_test_a
374377
COMMAND uv_run_tests_a
@@ -383,6 +386,10 @@ if(UNIX)
383386
endforeach(x)
384387
file(STRINGS configure.ac configure_ac REGEX ^AC_INIT)
385388
string(REGEX MATCH [0-9]+[.][0-9]+[.][0-9]+ PACKAGE_VERSION "${configure_ac}")
389+
string(REGEX MATCH ^[0-9]+ UV_VERSION_MAJOR "${PACKAGE_VERSION}")
390+
# The version in the filename is mirroring the behaviour of autotools.
391+
set_target_properties(uv PROPERTIES VERSION ${UV_VERSION_MAJOR}.0.0
392+
SOVERSION ${UV_VERSION_MAJOR})
386393
set(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
387394
set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
388395
set(prefix ${CMAKE_INSTALL_PREFIX})

0 commit comments

Comments
 (0)
Please sign in to comment.