FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

deps: update c-ares to v1.33.0 · nodejs/node@239588b · GitHub

/ node Public

Commit 239588b

Browse files
nodejs-github-bot
authored and
targos
committed
deps: update c-ares to v1.33.0
PR-URL: #54198 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Richard Lau <rlau@redhat.com>
1 parent 59a3952 commit 239588b

120 files changed

Lines changed: 4919 additions & 2705 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/cares/CMakeLists.txt‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ INCLUDE (CheckCSourceCompiles)
1212
INCLUDE (CheckStructHasMember)
1313
INCLUDE (CheckLibraryExists)
1414

15-
PROJECT (c-ares LANGUAGES C VERSION "1.32.3" )
15+
PROJECT (c-ares LANGUAGES C VERSION "1.33.0" )
1616

1717
# Set this version before release
1818
SET (CARES_VERSION "${PROJECT_VERSION}")
@@ -30,7 +30,7 @@ INCLUDE (GNUInstallDirs) # include this *AFTER* PROJECT(), otherwise paths are w
3030
# For example, a version of 4:0:2 would generate output such as:
3131
# libname.so -> libname.so.2
3232
# libname.so.2 -> libname.so.2.2.0
33-
SET (CARES_LIB_VERSIONINFO "19:3:17")
33+
SET (CARES_LIB_VERSIONINFO "20:0:18")
3434

3535

3636
OPTION (CARES_STATIC "Build as a static library" OFF)
@@ -42,6 +42,7 @@ OPTION (CARES_BUILD_CONTAINER_TESTS "Build and run container tests (implies CARE
4242
OPTION (CARES_BUILD_TOOLS "Build tools" ON)
4343
OPTION (CARES_SYMBOL_HIDING "Hide private symbols in shared libraries" OFF)
4444
OPTION (CARES_THREADS "Build with thread-safety support" ON)
45+
OPTION (CARES_COVERAGE "Build for code coverage" OFF)
4546
SET (CARES_RANDOM_FILE "/dev/urandom" CACHE STRING "Suitable File / Device Path for entropy, such as /dev/urandom")
4647

4748

@@ -265,7 +266,7 @@ IF (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
265266
ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
266267
LIST (APPEND SYSFLAGS -D_GNU_SOURCE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700)
267268
ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "SunOS")
268-
LIST (APPEND SYSFLAGS -D__EXTENSIONS__ -D_REENTRANT -D_XOPEN_SOURCE=700)
269+
LIST (APPEND SYSFLAGS -D__EXTENSIONS__ -D_REENTRANT -D_XOPEN_SOURCE=600)
269270
ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "AIX")
270271
LIST (APPEND SYSFLAGS -D_ALL_SOURCE -D_XOPEN_SOURCE=700 -D_USE_IRS)
271272
ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
@@ -409,6 +410,7 @@ CHECK_STRUCT_HAS_MEMBER("struct sockaddr_in6" sin6_scope_id "${CMAKE_EXTRA_INCLU
409410
CHECK_SYMBOL_EXISTS (closesocket "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_CLOSESOCKET)
410411
CHECK_SYMBOL_EXISTS (CloseSocket "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_CLOSESOCKET_CAMEL)
411412
CHECK_SYMBOL_EXISTS (connect "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_CONNECT)
413+
CHECK_SYMBOL_EXISTS (connectx "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_CONNECTX)
412414
CHECK_SYMBOL_EXISTS (fcntl "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_FCNTL)
413415
CHECK_SYMBOL_EXISTS (freeaddrinfo "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_FREEADDRINFO)
414416
CHECK_SYMBOL_EXISTS (getaddrinfo "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_GETADDRINFO)
@@ -423,6 +425,10 @@ CHECK_SYMBOL_EXISTS (if_indextoname "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_IF_INDE
423425
CHECK_SYMBOL_EXISTS (if_nametoindex "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_IF_NAMETOINDEX)
424426
CHECK_SYMBOL_EXISTS (ConvertInterfaceIndexToLuid "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_CONVERTINTERFACEINDEXTOLUID)
425427
CHECK_SYMBOL_EXISTS (ConvertInterfaceLuidToNameA "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_CONVERTINTERFACELUIDTONAMEA)
428+
CHECK_SYMBOL_EXISTS (NotifyIpInterfaceChange "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_NOTIFYIPINTERFACECHANGE)
429+
CHECK_SYMBOL_EXISTS (RegisterWaitForSingleObject "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_REGISTERWAITFORSINGLEOBJECT)
430+
431+
426432
CHECK_SYMBOL_EXISTS (inet_net_pton "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_INET_NET_PTON)
427433
IF (NOT WIN32)
428434
# Disabled on Windows, because these functions are only really supported on Windows
@@ -682,6 +688,27 @@ IF (HAVE_ARPA_NAMESER_COMPAT_H)
682688
SET (CARES_HAVE_ARPA_NAMESER_COMPAT_H 1)
683689
ENDIF()
684690

691+
692+
# Coverage
693+
IF (CARES_COVERAGE)
694+
# set compiler flags
695+
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftest-coverage -fprofile-arcs")
696+
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs")
697+
698+
# find required tools
699+
FIND_PROGRAM(LCOV lcov REQUIRED)
700+
FIND_PROGRAM(GENHTML genhtml REQUIRED)
701+
702+
# add coverage target
703+
ADD_CUSTOM_TARGET(coverage
704+
# gather data
705+
COMMAND ${LCOV} --directory . --capture --output-file coverage.info
706+
# generate report
707+
COMMAND ${GENHTML} --demangle-cpp -o coverage coverage.info
708+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
709+
)
710+
ENDIF()
711+
685712
# TRANSFORM_MAKEFILE_INC
686713
#
687714
# This function consumes the "Makefile.inc" autotools file, and converts it into
@@ -729,6 +756,8 @@ IF (CARES_BUILD_TESTS OR CARES_BUILD_CONTAINER_TESTS)
729756
ENDIF ()
730757

731758

759+
760+
732761
# Export targets
733762
IF (CARES_INSTALL)
734763
SET (CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")

‎deps/cares/LICENSE.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# c-ares license
2-
31
MIT License
42

53
Copyright (c) 1998 Massachusetts Institute of Technology

‎deps/cares/Makefile.Watcom‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,19 @@ all: $(ARESBUILDH) $(OBJ_BASE) $(TARGETS) $(DEMOS) .SYMBOLIC
9797
$(OBJ_BASE):
9898
-$(MD) $^@
9999
-$(MD) $^@\stat
100+
-$(MD) $^@\stat\dsa
101+
-$(MD) $^@\stat\event
102+
-$(MD) $^@\stat\legacy
103+
-$(MD) $^@\stat\record
104+
-$(MD) $^@\stat\str
105+
-$(MD) $^@\stat\util
100106
-$(MD) $^@\dyn
107+
-$(MD) $^@\dyn\dsa
108+
-$(MD) $^@\dyn\event
109+
-$(MD) $^@\dyn\legacy
110+
-$(MD) $^@\dyn\record
111+
-$(MD) $^@\dyn\str
112+
-$(MD) $^@\dyn\util
101113
-$(MD) $^@\tools
102114

103115
$(ARESBUILDH): .EXISTSONLY
@@ -129,7 +141,19 @@ vclean realclean: clean .SYMBOLIC
129141
-$(RM) $(TARGETS) $(LIBNAME).map
130142
-$(RM) $(DEMOS) $(DEMOS:.exe=.map)
131143
-$(RD) $(OBJ_BASE)\stat
144+
-$(RD) $(OBJ_BASE)\stat\dsa
145+
-$(RD) $(OBJ_BASE)\stat\event
146+
-$(RD) $(OBJ_BASE)\stat\legacy
147+
-$(RD) $(OBJ_BASE)\stat\record
148+
-$(RD) $(OBJ_BASE)\stat\str
149+
-$(RD) $(OBJ_BASE)\stat\util
132150
-$(RD) $(OBJ_BASE)\dyn
151+
-$(RD) $(OBJ_BASE)\dyn\dsa
152+
-$(RD) $(OBJ_BASE)\dyn\event
153+
-$(RD) $(OBJ_BASE)\dyn\legacy
154+
-$(RD) $(OBJ_BASE)\dyn\record
155+
-$(RD) $(OBJ_BASE)\dyn\str
156+
-$(RD) $(OBJ_BASE)\dyn\util
133157
-$(RD) $(OBJ_BASE)\tools
134158
-$(RD) $(OBJ_BASE)
135159

@@ -144,10 +168,58 @@ $(RESOURCE): src\lib\cares.rc .AUTODEPEND
144168
.c{$(OBJ_BASE)\dyn}.obj:
145169
$(CC) $(CFLAGS) -bd .\src\lib\$^& -fo=$^@
146170

171+
.ERASE
172+
{dsa}.c{$(OBJ_BASE)\dyn\dsa}.obj:
173+
$(CC) $(CFLAGS) -bd .\src\lib\dsa\$^& -fo=$^@
174+
175+
.ERASE
176+
{event}.c{$(OBJ_BASE)\dyn\event}.obj:
177+
$(CC) $(CFLAGS) -bd .\src\lib\event\$^& -fo=$^@
178+
179+
.ERASE
180+
{legacy}.c{$(OBJ_BASE)\dyn\legacy}.obj:
181+
$(CC) $(CFLAGS) -bd .\src\lib\legacy\$^& -fo=$^@
182+
183+
.ERASE
184+
{record}.c{$(OBJ_BASE)\dyn\record}.obj:
185+
$(CC) $(CFLAGS) -bd .\src\lib\record\$^& -fo=$^@
186+
187+
.ERASE
188+
{str}.c{$(OBJ_BASE)\dyn\str}.obj:
189+
$(CC) $(CFLAGS) -bd .\src\lib\str\$^& -fo=$^@
190+
191+
.ERASE
192+
{util}.c{$(OBJ_BASE)\dyn\util}.obj:
193+
$(CC) $(CFLAGS) -bd .\src\lib\util\$^& -fo=$^@
194+
147195
.ERASE
148196
.c{$(OBJ_BASE)\stat}.obj:
149197
$(CC) $(CFLAGS) -DCARES_STATICLIB .\src\lib\$^& -fo=$^@
150198

199+
.ERASE
200+
{dsa}.c{$(OBJ_BASE)\stat\dsa}.obj:
201+
$(CC) $(CFLAGS) -DCARES_STATICLIB .\src\lib\dsa\$^& -fo=$^@
202+
203+
.ERASE
204+
{event}.c{$(OBJ_BASE)\stat\event}.obj:
205+
$(CC) $(CFLAGS) -DCARES_STATICLIB .\src\lib\event\$^& -fo=$^@
206+
207+
.ERASE
208+
{legacy}.c{$(OBJ_BASE)\stat\legacy}.obj:
209+
$(CC) $(CFLAGS) -DCARES_STATICLIB .\src\lib\legacy\$^& -fo=$^@
210+
211+
.ERASE
212+
{record}.c{$(OBJ_BASE)\stat\record}.obj:
213+
$(CC) $(CFLAGS) -DCARES_STATICLIB .\src\lib\record\$^& -fo=$^@
214+
215+
.ERASE
216+
{str}.c{$(OBJ_BASE)\stat\str}.obj:
217+
$(CC) $(CFLAGS) -DCARES_STATICLIB .\src\lib\str\$^& -fo=$^@
218+
219+
.ERASE
220+
{util}.c{$(OBJ_BASE)\stat\util}.obj:
221+
$(CC) $(CFLAGS) -DCARES_STATICLIB .\src\lib\util\$^& -fo=$^@
222+
151223
$(LINK_ARG): $(__MAKEFILES__)
152224
%create $^@
153225
@%append $^@ system nt dll

‎deps/cares/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
AUTOMAKE_OPTIONS = foreign nostdinc 1.9.6
2323
ACLOCAL_AMFLAGS = -I m4 --install
2424

25-
MSVCFILES = msvc_ver.inc buildconf.bat
25+
MSVCFILES = buildconf.bat
2626

2727
# adig and ahost are just sample programs and thus not mentioned with the
2828
# regular sources and headers

‎deps/cares/Makefile.dj‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,14 @@
55
#
66
include src/lib/Makefile.inc
77

8-
CSOURCES := $(addprefix src/lib/, $(CSOURCES))
9-
CSOURCES := $(filter-out src/lib/windows_port.c, $(CSOURCES))
8+
OBJ_DIR = djgpp
9+
OBJECTS = $(addprefix $(OBJ_DIR)/, \
10+
$(CSOURCES:.c=.o))
11+
12+
CSRC = $(addprefix src/lib/, $(CSOURCES))
13+
#CSRC := $(filter-out src/lib/windows_port.c, $(CSOURCES))
14+
15+
OBJ_SUBDIRS = $(OBJ_DIR)/dsa $(OBJ_DIR)/event $(OBJ_DIR)/legacy $(OBJ_DIR)/record $(OBJ_DIR)/str $(OBJ_DIR)/util
1016

1117
VPATH = src/lib src/tools
1218

@@ -17,8 +23,6 @@ VPATH = src/lib src/tools
1723
WATT32_ROOT = $(realpath $(WATT_ROOT))
1824
WATT32_LIB = $(WATT32_ROOT)/lib/libwatt.a
1925

20-
OBJ_DIR = djgpp
21-
2226
CFLAGS = -g -O2 -I./include -I./src/lib \
2327
-I$(WATT32_ROOT)/inc \
2428
-Wall \
@@ -82,17 +86,14 @@ else
8286
CC = gcc
8387
endif
8488

85-
OBJECTS = $(addprefix $(OBJ_DIR)/, \
86-
$(notdir $(CSOURCES:.c=.o)))
87-
8889
GENERATED = src/lib/ares_config.h \
8990
include/ares_build.h
9091

9192
TARGETS = libcares.a adig.exe ahost.exe
9293

9394
.SECONDARY: $(OBJ_DIR)/ares_getopt.o
9495

95-
all: $(OBJ_DIR) $(GENERATED) $(TARGETS)
96+
all: $(OBJ_DIR) $(OBJ_SUBDIRS) $(GENERATED) $(TARGETS)
9697
@echo Welcome to c-ares.
9798

9899
libcares.a: $(OBJECTS)
@@ -111,15 +112,19 @@ include/ares_build.h: include/ares_build.h.dist
111112
#
112113
clean:
113114
- rm -f depend.dj $(GENERATED) $(OBJ_DIR)/*.o
114-
- rmdir $(OBJ_DIR)
115+
- rmdir $(OBJ_SUBDIRS)
115116

116117
# Clean everything
117118
#
118119
realclean vclean: clean
119120
- rm -f $(TARGETS) $(TARGETS:.exe=.map)
120121

121-
$(OBJ_DIR):
122-
- mkdir $@
122+
.PHONY: obj_subdirs $(OBJ_SUBDIRS)
123+
124+
obj_subdirs: $(OBJ_SUBDIRS)
125+
126+
$(OBJ_SUBDIRS):
127+
mkdir $@
123128

124129
$(OBJ_DIR)/%.o: %.c
125130
$(CC) $(CFLAGS) -o $@ -c $<
@@ -138,7 +143,7 @@ DEP_REPLACE = sed -e 's@\(.*\)\.o: @\n$$(OBJ_DIR)\/\1.o: @' \
138143
# a foreign 'curl_config.h' is making trouble.
139144
#
140145
depend: $(GENERATED) Makefile.dj
141-
$(CC) -MM $(CFLAGS) $(CSOURCES) | $(DEP_REPLACE) > depend.dj
146+
$(CC) -MM $(CFLAGS) $(CSRC) | $(DEP_REPLACE) > depend.dj
142147

143148
-include depend.dj
144149

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL