Skip to content

Commit

Permalink
libuv: update to 1.46.0
Browse files Browse the repository at this point in the history
Signed-off-by: Rosen Penev <[email protected]>
  • Loading branch information
neheb committed Sep 15, 2023
1 parent aefb855 commit 9292e72
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 18 deletions.
1 change: 1 addition & 0 deletions releases.json
Original file line number Diff line number Diff line change
Expand Up @@ -1578,6 +1578,7 @@
"libuv"
],
"versions": [
"1.46.0-1",
"1.44.2-2",
"1.44.2-1",
"1.44.1-1",
Expand Down
9 changes: 4 additions & 5 deletions subprojects/libuv.wrap
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
[wrap-file]
directory = libuv-v1.44.2
source_url = https://dist.libuv.org/dist/v1.44.2/libuv-v1.44.2.tar.gz
source_filename = libuv-v1.44.2.tar.gz
source_hash = ccfcdc968c55673c6526d8270a9c8655a806ea92468afcbcabc2b16040f03cb4
directory = libuv-v1.46.0
source_url = https://dist.libuv.org/dist/v1.46.0/libuv-v1.46.0.tar.gz
source_filename = libuv-v1.46.0.tar.gz
source_hash = 111f83958b9fdc65f1489195d25f342b9f7a3e683140c60e62c00fbaccddddce
patch_directory = libuv

[provide]
libuv = libuv_dep

23 changes: 10 additions & 13 deletions subprojects/packagefiles/libuv/meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project(
'libuv',
'c',
version: '1.44.2',
version: '1.46.0',
license: 'libuv',
default_options : [ 'c_std=gnu99' ],
meson_version: '>=0.49.0',
Expand Down Expand Up @@ -102,10 +102,11 @@ libuv_src = [
'src/random.c',
'src/strscpy.c',
'src/strtok.c',
'src/thread-common.c',
'src/threadpool.c',
'src/timer.c',
'src/uv-data-getter-setters.c',
'src/uv-common.c',
'src/uv-data-getter-setters.c',
'src/version.c',
]

Expand All @@ -115,7 +116,7 @@ if win32
'-DWIN32_LEAN_AND_MEAN',
'-D_WIN32_WINNT=0x0602',
]
libuv_libs += ['psapi', 'user32', 'advapi32', 'iphlpapi', 'userenv', 'ws2_32']
libuv_libs += ['psapi', 'user32', 'advapi32', 'iphlpapi', 'userenv', 'ws2_32', 'dbghelp', 'ole32', 'uuid']
libuv_src += [
'src/win/async.c',
'src/win/core.c',
Expand Down Expand Up @@ -207,15 +208,11 @@ if android
libuv_cargs += '-D_GNU_SOURCE'
libuv_libs += 'dl'
libuv_src += [
'src/unix/linux-core.c',
'src/unix/linux-inotify.c',
'src/unix/linux-syscalls.c',
'src/unix/linux.c',
'src/unix/procfs-exepath.c',
'src/unix/pthread-fixes.c',
'src/unix/random-getentropy.c',
'src/unix/random-getrandom.c',
'src/unix/random-sysctl-linux.c',
'src/unix/epoll.c',
]
endif

Expand Down Expand Up @@ -286,13 +283,10 @@ if linux
]
libuv_libs += ['dl', 'rt']
libuv_src += [
'src/unix/linux-core.c',
'src/unix/linux-inotify.c',
'src/unix/linux-syscalls.c',
'src/unix/linux.c',
'src/unix/procfs-exepath.c',
'src/unix/random-getrandom.c',
'src/unix/random-sysctl-linux.c',
'src/unix/epoll.c',
]
libuv_headers += [
'include/uv/linux.h',
Expand Down Expand Up @@ -585,12 +579,14 @@ if libuv_build_tests
'test/test-tcp-unexpected-read.c',
'test/test-tcp-write-after-connect.c',
'test/test-tcp-write-fail.c',
'test/test-tcp-write-in-a-row.c',
'test/test-tcp-write-queue-order.c',
'test/test-tcp-write-to-half-open-connection.c',
'test/test-tcp-writealot.c',
'test/test-test-macros.c',
'test/test-thread-equal.c',
'test/test-thread.c',
'test/test-thread-affinity.c',
'test/test-threadpool-cancel.c',
'test/test-threadpool.c',
'test/test-timer-again.c',
Expand All @@ -615,6 +611,7 @@ if libuv_build_tests
'test/test-udp-multicast-ttl.c',
'test/test-udp-open.c',
'test/test-udp-options.c',
'test/test-udp-recv-in-a-row.c',
'test/test-udp-send-and-recv.c',
'test/test-udp-send-hang-loop.c',
'test/test-udp-send-immediate.c',
Expand All @@ -625,7 +622,7 @@ if libuv_build_tests
'test/test-walk-handles.c',
'test/test-watcher-cross-stop.c',
]
libuv_test_cargs = cc.get_supported_arguments('-Wno-int-conversion')
libuv_test_cargs = cc.get_supported_arguments('-Wno-int-conversion', '-D_GNU_SOURCE')
if cc_msvc
if get_option('default_library') == 'both'
error('default_library=both is not supported with MSVC')
Expand Down

0 comments on commit 9292e72

Please sign in to comment.