Skip to content

Commit

Permalink
libuv: upgrade to v2 master fork
Browse files Browse the repository at this point in the history
Now synchronized with v1.24.0
  • Loading branch information
vtjnash committed Nov 15, 2018
1 parent d6ada0e commit d7d9355
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 16 deletions.
4 changes: 2 additions & 2 deletions Make.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
15fe40db66f633b9713818f9ba9582cb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5cd6eab8a9639a88b59bd1d871941a94d386af0dbcd1a86090820287b040f570be560cddb9c71e38b227ca0c43550e8b4c029929890ab07574ceca47d30f32ee

This file was deleted.

This file was deleted.

16 changes: 8 additions & 8 deletions deps/libuv.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@ LIBUV_GIT_URL:=git://github.com/JuliaLang/libuv.git
LIBUV_TAR_URL=https://api.github.com/repos/JuliaLang/libuv/tarball/$1
$(eval $(call git-external,libuv,LIBUV,configure,,$(SRCCACHE)))

UV_CFLAGS := -D_GNU_SOURCE
UV_CFLAGS := -O2
ifeq ($(USEMSVC), 1)
UV_CFLAGS += -DBUILDING_UV_SHARED
endif
ifeq ($(USEICC), 1)
UV_CFLAGS += -static-intel
endif

UV_MFLAGS += LDFLAGS="$(LDFLAGS) $(CLDFLAGS) -v"
UV_FLAGS := LDFLAGS="$(LDFLAGS) $(CLDFLAGS) -v"
ifneq ($(UV_CFLAGS),)
UV_MFLAGS += CFLAGS="$(CFLAGS) $(UV_CFLAGS)"
UV_FLAGS += CFLAGS="$(CFLAGS) $(UV_CFLAGS)"
endif
ifeq ($(USEMSVC), 1)
UV_FLAGS += --disable-shared
endif

ifneq ($(VERBOSE), 0)
UV_MFLAGS += V=1
endif
ifneq ($(USEMSVC), 1)
UV_FLAGS := $(UV_MFLAGS)
else
UV_FLAGS := --disable-shared $(UV_MFLAGS)
endif


$(BUILDDIR)/$(LIBUV_SRC_DIR)/build-configured: $(SRCCACHE)/$(LIBUV_SRC_DIR)/source-extracted
touch -c $(SRCCACHE)/$(LIBUV_SRC_DIR)/aclocal.m4 # touch a few files to prevent autogen from getting called
Expand Down
4 changes: 2 additions & 2 deletions deps/libuv.version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LIBUV_BRANCH=julia-uv2
LIBUV_SHA1=ed3700c849289ed01fe04273a7bf865340b2bd7e
LIBUV_BRANCH=julia-uv2-1.24.0
LIBUV_SHA1=a1d8f832a10a5dbbc1b0b1835576ba24fceba0de
7 changes: 6 additions & 1 deletion src/jl_uv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 7 additions & 1 deletion src/uv_constants.h
Original file line number Diff line number Diff line change
@@ -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)]
Expand Down

0 comments on commit d7d9355

Please sign in to comment.