Skip to content

Commit b4ebe6d

Browse files
targosBethGriggs
authored andcommittedMar 27, 2023
deps: update c-ares to 1.19.0
Refs: https://c-ares.org/changelog.html#1_19_0 PR-URL: #46415 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent de6dd67 commit b4ebe6d

File tree

91 files changed

+4381
-3659
lines changed

Some content is hidden

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

91 files changed

+4381
-3659
lines changed
 

‎deps/cares/CHANGES

+443-164
Large diffs are not rendered by default.

‎deps/cares/CMakeLists.txt

+15-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ INCLUDE (CheckCSourceCompiles)
88
INCLUDE (CheckStructHasMember)
99
INCLUDE (CheckLibraryExists)
1010

11-
PROJECT (c-ares LANGUAGES C VERSION "1.18.0" )
11+
PROJECT (c-ares LANGUAGES C VERSION "1.19.0" )
1212

1313
# Set this version before release
14-
SET (CARES_VERSION "1.18.1")
14+
SET (CARES_VERSION "1.19.0")
1515

1616
INCLUDE (GNUInstallDirs) # include this *AFTER* PROJECT(), otherwise paths are wrong.
1717

@@ -26,7 +26,7 @@ INCLUDE (GNUInstallDirs) # include this *AFTER* PROJECT(), otherwise paths are w
2626
# For example, a version of 4:0:2 would generate output such as:
2727
# libname.so -> libname.so.2
2828
# libname.so.2 -> libname.so.2.2.0
29-
SET (CARES_LIB_VERSIONINFO "7:1:5")
29+
SET (CARES_LIB_VERSIONINFO "8:0:6")
3030

3131

3232
OPTION (CARES_STATIC "Build as a static library" OFF)
@@ -82,9 +82,14 @@ SET (TARGETS_INST_DEST
8282

8383
# Function in Library
8484
# CHECK_LIBRARY_EXISTS can't be used as it will return true if the function
85-
# is found in a different dependent library.
85+
# is found in a different required/dependent library.
8686
MACRO (CARES_FUNCTION_IN_LIBRARY func lib var)
87+
88+
SET (_ORIG_CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
89+
SET (CMAKE_REQUIRED_LIBRARIES )
8790
CHECK_FUNCTION_EXISTS ("${func}" "_CARES_FUNC_IN_LIB_GLOBAL_${func}")
91+
SET (CMAKE_REQUIRED_LIBRARIES "${_ORIG_CMAKE_REQUIRED_LIBRARIES}")
92+
8893
IF ("${_CARES_FUNC_IN_LIB_GLOBAL_${func}}")
8994
SET (${var} FALSE)
9095
ELSE ()
@@ -689,6 +694,12 @@ IF (CARES_INSTALL)
689694
if( ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" )
690695

691696
if ( "${CPACK_PACKAGE_ARCHITECTURE}" STREQUAL "" )
697+
set( CPACK_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}" )
698+
endif()
699+
if ( "${CPACK_PACKAGE_ARCHITECTURE}" STREQUAL "" )
700+
if ( "${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows" )
701+
message( FATAL_ERROR "Failed to determine CPACK_PACKAGE_ARCHITECTURE. Is CMAKE_SYSTEM_PROCESSOR set?" )
702+
endif()
692703
# Note: the architecture should default to the local architecture, but it
693704
# in fact comes up empty. We call `uname -m` to ask the kernel instead.
694705
EXECUTE_PROCESS( COMMAND uname -m COMMAND tr -d '\n' OUTPUT_VARIABLE CPACK_PACKAGE_ARCHITECTURE )

0 commit comments

Comments
 (0)
Please sign in to comment.