libuv: upgrade to v2 master fork

Now synchronized with v1.24.0
JuliaLang · Nov 15, 2018 · 86fe9f0 · 86fe9f0
1 parent d6ada0e
commit 86fe9f0
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 8 deletions.
diff --git a/Make.inc b/Make.inc
@@ -1042,13 +1042,13 @@ ifeq ($(OS), WINNT)
 ifneq ($(USEMSVC), 1)
 HAVE_SSP := 1
 OSLIBS += -Wl,--export-all-symbols -Wl,--version-script=$(JULIAHOME)/src/julia.expmap \
-	$(NO_WHOLE_ARCHIVE) -lpsapi -lkernel32 -lws2_32 -liphlpapi -lwinmm -ldbghelp -luserenv
+	$(NO_WHOLE_ARCHIVE) -lpsapi -lkernel32 -lws2_32 -liphlpapi -lwinmm -ldbghelp -luserenv -lsecur32
 JLDFLAGS := -Wl,--stack,8388608
 ifeq ($(ARCH),i686)
 JLDFLAGS += -Wl,--large-address-aware
 endif
 else #USEMSVC
-OSLIBS += kernel32.lib ws2_32.lib psapi.lib advapi32.lib iphlpapi.lib shell32.lib winmm.lib userenv.lib
+OSLIBS += kernel32.lib ws2_32.lib psapi.lib advapi32.lib iphlpapi.lib shell32.lib winmm.lib userenv.lib secur32.lib
 JLDFLAGS := -stack:8388608
 endif
 JCPPFLAGS += -D_WIN32_WINNT=0x0502

diff --git a/deps/checksums/libuv-15de959659cc10ddacef25928dca9b3b4b68a097.tar.gz/md5 b/deps/checksums/libuv-15de959659cc10ddacef25928dca9b3b4b68a097.tar.gz/md5
@@ -0,0 +1 @@
+0e2aff3d376ff22125574d11ff99ca4e
diff --git a/deps/checksums/libuv-15de959659cc10ddacef25928dca9b3b4b68a097.tar.gz/sha512 b/deps/checksums/libuv-15de959659cc10ddacef25928dca9b3b4b68a097.tar.gz/sha512
@@ -0,0 +1 @@
+20fc7e32cc709b5d1c6aee706954772dcdb3c482acee53db68d6091a6cbcff0730b75012f16a704c0533d557cdeb4c62a01d551500a5132430e3d33582ee3f9e
diff --git a/deps/checksums/libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz/md5 b/deps/checksums/libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz/md5
diff --git a/deps/checksums/libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz/sha512 b/deps/checksums/libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz/sha512
diff --git a/deps/libuv.version b/deps/libuv.version
@@ -1,2 +1,2 @@
-LIBUV_BRANCH=julia-uv2
-LIBUV_SHA1=ed3700c849289ed01fe04273a7bf865340b2bd7e
+LIBUV_BRANCH=julia-uv2-1.24.0
+LIBUV_SHA1=15de959659cc10ddacef25928dca9b3b4b68a097
diff --git a/src/jl_uv.c b/src/jl_uv.c
@@ -292,11 +292,16 @@ JL_DLLEXPORT int jl_spawn(char *name, char **argv,
                           uv_stdio_container_t *stdio, int nstdio,
                           uint32_t flags, char **env, char *cwd, uv_exit_cb cb)
 {
-    uv_process_options_t opts;
+    uv_process_options_t opts = {0};
     opts.stdio = stdio;
     opts.file = name;
     opts.env = env;
     opts.flags = flags;
+    // unused fields:
+    //opts.uid = 0;
+    //opts.gid = 0;
+    //opts.cpumask = NULL;
+    //opts.cpumask_size = 0;
     opts.cwd = cwd;
     opts.args = argv;
     opts.stdio_count = nstdio;

diff --git a/src/uv_constants.h b/src/uv_constants.h
@@ -1,8 +1,14 @@
 // This file is a part of Julia. License is MIT: https://julialang.org/license
 
 #include "uv.h"
+#if EDOM > 0
+# define UV__ERR(x) (-(x))
+#else
+# define UV__ERR(x) (x)
+#endif
 #define XX(uc,lc) :UV_##uc,
-#define YY(uc,lc) (:UV_##uc,UV__##uc),
+#define YY(uc,mc) (:UV_##uc,UV__##uc),
+
 const uv_handle_types = [UV_HANDLE_TYPE_MAP(XX) :UV_FILE]
 const uv_req_types = [UV_REQ_TYPE_MAP(XX)]
 const uv_err_vals = [UV_ERRNO_MAP(YY)]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		20fc7e32cc709b5d1c6aee706954772dcdb3c482acee53db68d6091a6cbcff0730b75012f16a704c0533d557cdeb4c62a01d551500a5132430e3d33582ee3f9e