Skip to content

Commit f657d58

Browse files
ryry
committed
Upgrade libuv to f9b9bb44bd6e2b74729b5d1ff481adf4213e9a0b
1 parent 6c121ed commit f657d58

139 files changed

Lines changed: 6094 additions & 67564 deletions

File tree

Some content is hidden

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

‎deps/uv/AUTHORS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,8 @@ Ryan Dahl <ryan@joyent.com>
33
Bert Belder <bertbelder@gmail.com>
44
Josh Roesslein <jroesslein@gmail.com>
55
Alan Gutierrez <alan@prettyrobots.com>
6+
Igor Zinkovsky <igorzi@microsoft.com>
67
Vanilla Hsu <vanilla@fatpipi.com>
78
Ben Noordhuis <info@bnoordhuis.nl>
9+
Henry Rawas <henryr@schakra.com>
10+
Robert Mustacchi <rm@joyent.com>

‎deps/uv/Makefile‎

Lines changed: 57 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,80 @@
2020

2121
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
2222

23+
ifdef MSVC
24+
uname_S := MINGW
25+
endif
26+
27+
CPPFLAGS += -Ic-ares/
28+
CARES_OBJS =
29+
CARES_OBJS += c-ares/ares__close_sockets.o
30+
CARES_OBJS += c-ares/ares__get_hostent.o
31+
CARES_OBJS += c-ares/ares__read_line.o
32+
CARES_OBJS += c-ares/ares__timeval.o
33+
CARES_OBJS += c-ares/ares_cancel.o
34+
CARES_OBJS += c-ares/ares_data.o
35+
CARES_OBJS += c-ares/ares_destroy.o
36+
CARES_OBJS += c-ares/ares_expand_name.o
37+
CARES_OBJS += c-ares/ares_expand_string.o
38+
CARES_OBJS += c-ares/ares_fds.o
39+
CARES_OBJS += c-ares/ares_free_hostent.o
40+
CARES_OBJS += c-ares/ares_free_string.o
41+
CARES_OBJS += c-ares/ares_gethostbyaddr.o
42+
CARES_OBJS += c-ares/ares_gethostbyname.o
43+
CARES_OBJS += c-ares/ares_getnameinfo.o
44+
CARES_OBJS += c-ares/ares_getopt.o
45+
CARES_OBJS += c-ares/ares_getsock.o
46+
CARES_OBJS += c-ares/ares_init.o
47+
CARES_OBJS += c-ares/ares_library_init.o
48+
CARES_OBJS += c-ares/ares_llist.o
49+
CARES_OBJS += c-ares/ares_mkquery.o
50+
CARES_OBJS += c-ares/ares_nowarn.o
51+
CARES_OBJS += c-ares/ares_options.o
52+
CARES_OBJS += c-ares/ares_parse_a_reply.o
53+
CARES_OBJS += c-ares/ares_parse_aaaa_reply.o
54+
CARES_OBJS += c-ares/ares_parse_mx_reply.o
55+
CARES_OBJS += c-ares/ares_parse_ns_reply.o
56+
CARES_OBJS += c-ares/ares_parse_ptr_reply.o
57+
CARES_OBJS += c-ares/ares_parse_srv_reply.o
58+
CARES_OBJS += c-ares/ares_parse_txt_reply.o
59+
CARES_OBJS += c-ares/ares_process.o
60+
CARES_OBJS += c-ares/ares_query.o
61+
CARES_OBJS += c-ares/ares_search.o
62+
CARES_OBJS += c-ares/ares_send.o
63+
CARES_OBJS += c-ares/ares_strcasecmp.o
64+
CARES_OBJS += c-ares/ares_strdup.o
65+
CARES_OBJS += c-ares/ares_strerror.o
66+
CARES_OBJS += c-ares/ares_timeout.o
67+
CARES_OBJS += c-ares/ares_version.o
68+
CARES_OBJS += c-ares/ares_writev.o
69+
CARES_OBJS += c-ares/bitncmp.o
70+
CARES_OBJS += c-ares/inet_net_pton.o
71+
CARES_OBJS += c-ares/inet_ntop.o
72+
2373
ifneq (,$(findstring MINGW,$(uname_S)))
2474
include config-mingw.mk
2575
else
2676
include config-unix.mk
2777
endif
2878

2979
TESTS=test/echo-server.c test/test-*.c
30-
BENCHMARKS=test/echo-server.c test/benchmark-*.c
80+
BENCHMARKS=test/echo-server.c test/dns-server.c test/benchmark-*.c
3181

3282
all: uv.a test/run-tests test/run-benchmarks
3383

84+
$(CARES_OBJS): %.o: %.c
85+
$(CC) -o $*.o -c $(CFLAGS) $(CPPFLAGS) $< -DHAVE_CONFIG_H
86+
3487
test/run-tests$(E): test/*.h test/run-tests.c $(RUNNER_SRC) test/runner-unix.c $(TESTS) uv.a
35-
$(CC) $(RUNNER_CFLAGS) $(RUNNER_LINKFLAGS) -o test/run-tests test/run-tests.c \
88+
$(CC) $(CPPFLAGS) $(RUNNER_CFLAGS) $(RUNNER_LINKFLAGS) -o test/run-tests test/run-tests.c \
3689
test/runner.c $(RUNNER_SRC) $(TESTS) uv.a $(RUNNER_LIBS)
3790

3891
test/run-benchmarks$(E): test/*.h test/run-benchmarks.c test/runner.c $(RUNNER_SRC) $(BENCHMARKS) uv.a
39-
$(CC) $(RUNNER_CFLAGS) $(RUNNER_LINKFLAGS) -o test/run-benchmarks test/run-benchmarks.c \
92+
$(CC) $(CPPFLAGS) $(RUNNER_CFLAGS) $(RUNNER_LINKFLAGS) -o test/run-benchmarks test/run-benchmarks.c \
4093
test/runner.c $(RUNNER_SRC) $(BENCHMARKS) uv.a $(RUNNER_LIBS)
4194

4295
test/echo.o: test/echo.c test/echo.h
43-
$(CC) $(CFLAGS) -c test/echo.c -o test/echo.o
96+
$(CC) $(CPPFLAGS) $(CFLAGS) -c test/echo.c -o test/echo.o
4497

4598

4699
.PHONY: clean clean-platform distclean distclean-platform test benchmark

‎deps/uv/c-ares/CMakeLists.txt‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
2+
include_directories(${node_platform}-${cares_arch})
3+
add_definitions(-DHAVE_CONFIG_H=1)
4+
5+
include(CheckLibraryExists)
6+
check_library_exists(socket socket "" HAVE_SOCKET_LIB)
7+
check_library_exists(nsl gethostbyname "" HAVE_NSL_LIB)
8+
9+
file(GLOB lib_sources *.c)
10+
add_library(cares ${lib_sources})
11+
12+
if(${HAVE_SOCKET_LIB})
13+
set(cares_libs ${cares_libs} socket)
14+
endif()
15+
16+
if(${HAVE_NSL_LIB})
17+
set(cares_libs ${cares_libs} nsl)
18+
endif()
19+
20+
if(cares_libs)
21+
target_link_libraries(cares ${cares_libs})
22+
endif()

‎deps/uv/c-ares/Makefile.Watcom‎

Lines changed: 0 additions & 169 deletions
This file was deleted.

0 commit comments

Comments
 (0)