Chiebot-Mirror
/
grpc
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #18519 from apolcyn/fho_update_cares

Browse Source 
Update the c-ares submodule to the 1.15 release
pull/18501/head^2
apolcyn 6 years ago committed by GitHub
parent 65ec942940 cab0c36d99
commit d65e661dfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 32 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      Makefile
  2. 4
      bazel/grpc_deps.bzl
  3. 2
      grpc.gemspec
  4. 2
      src/c-ares/gen_build_yaml.py
  5. 1
      src/python/grpcio/grpc_core_dependencies.py
  6. 2
      test/distrib/cpp/run_distrib_test_cmake.sh
  7. 2
      third_party/cares/cares
  8. 2
      third_party/cares/cares.BUILD
  9. 3
      third_party/cares/config_android/ares_config.h
  10. 3
      third_party/cares/config_darwin/ares_config.h
  11. 3
      third_party/cares/config_freebsd/ares_config.h
  12. 3
      third_party/cares/config_linux/ares_config.h
  13. 3
      third_party/cares/config_openbsd/ares_config.h
  14. 3
      third_party/cares/config_windows/ares_config.h
  15. 1
      tools/run_tests/generated/sources_and_headers.json
  16. 2
      tools/run_tests/sanity/check_submodules.sh

1
Makefile
Unescape View File

@ -8227,6 +8227,7 @@ LIBARES_SRC = \
third_party/cares/cares/ares_strcasecmp.c \
third_party/cares/cares/ares_strdup.c \
third_party/cares/cares/ares_strerror.c \
third_party/cares/cares/ares_strsplit.c \
third_party/cares/cares/ares_timeout.c \
third_party/cares/cares/ares_version.c \
third_party/cares/cares/ares_writev.c \

4
bazel/grpc_deps.bzl
Unescape View File

@ -162,8 +162,8 @@ def grpc_deps():
http_archive(
name = "com_github_cares_cares",
build_file = "@com_github_grpc_grpc//third_party:cares/cares.BUILD",
strip_prefix = "c-ares-3be1924221e1326df520f8498d704a5c4c8d0cce",
url = "https://github.com/c-ares/c-ares/archive/3be1924221e1326df520f8498d704a5c4c8d0cce.tar.gz",
strip_prefix = "c-ares-e982924acee7f7313b4baa4ee5ec000c5e373c30",
url = "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz",
)
if "com_google_absl" not in native.existing_rules():

2
grpc.gemspec
Unescape View File

@ -1266,6 +1266,7 @@ Gem::Specification.new do |s|
s.files += %w( third_party/cares/cares/ares_setup.h )
s.files += %w( third_party/cares/cares/ares_strcasecmp.h )
s.files += %w( third_party/cares/cares/ares_strdup.h )
s.files += %w( third_party/cares/cares/ares_strsplit.h )
s.files += %w( third_party/cares/cares/ares_version.h )
s.files += %w( third_party/cares/cares/bitncmp.h )
s.files += %w( third_party/cares/cares/config-win32.h )
@ -1317,6 +1318,7 @@ Gem::Specification.new do |s|
s.files += %w( third_party/cares/cares/ares_strcasecmp.c )
s.files += %w( third_party/cares/cares/ares_strdup.c )
s.files += %w( third_party/cares/cares/ares_strerror.c )
s.files += %w( third_party/cares/cares/ares_strsplit.c )
s.files += %w( third_party/cares/cares/ares_timeout.c )
s.files += %w( third_party/cares/cares/ares_version.c )
s.files += %w( third_party/cares/cares/ares_writev.c )

2
src/c-ares/gen_build_yaml.py
Unescape View File

@ -97,6 +97,7 @@ try:
"third_party/cares/cares/ares_strcasecmp.c",
"third_party/cares/cares/ares_strdup.c",
"third_party/cares/cares/ares_strerror.c",
"third_party/cares/cares/ares_strsplit.c",
"third_party/cares/cares/ares_timeout.c",
"third_party/cares/cares/ares_version.c",
"third_party/cares/cares/ares_writev.c",
@ -123,6 +124,7 @@ try:
"third_party/cares/cares/ares_setup.h",
"third_party/cares/cares/ares_strcasecmp.h",
"third_party/cares/cares/ares_strdup.h",
"third_party/cares/cares/ares_strsplit.h",
"third_party/cares/cares/ares_version.h",
"third_party/cares/cares/bitncmp.h",
"third_party/cares/cares/config-win32.h",

1
src/python/grpcio/grpc_core_dependencies.py
Unescape View File

@ -699,6 +699,7 @@ CORE_SOURCE_FILES = [
'third_party/cares/cares/ares_strcasecmp.c',
'third_party/cares/cares/ares_strdup.c',
'third_party/cares/cares/ares_strerror.c',
'third_party/cares/cares/ares_strsplit.c',
'third_party/cares/cares/ares_timeout.c',
'third_party/cares/cares/ares_version.c',
'third_party/cares/cares/ares_writev.c',

2
test/distrib/cpp/run_distrib_test_cmake.sh
Unescape View File

@ -24,7 +24,7 @@ apt-get install -t jessie-backports -y libssl-dev
# Install c-ares
cd third_party/cares/cares
git fetch origin
git checkout cares-1_13_0
git checkout cares-1_15_0
mkdir -p cmake/build
cd cmake/build
cmake -DCMAKE_BUILD_TYPE=Release ../..

2
third_party/cares/cares vendored

@ -1 +1 @@
Subproject commit 3be1924221e1326df520f8498d704a5c4c8d0cce
Subproject commit e982924acee7f7313b4baa4ee5ec000c5e373c30

2
third_party/cares/cares.BUILD vendored
Unescape View File

@ -112,6 +112,7 @@ cc_library(
"ares_send.c",
"ares_strcasecmp.c",
"ares_strdup.c",
"ares_strsplit.c",
"ares_strerror.c",
"ares_timeout.c",
"ares_version.c",
@ -141,6 +142,7 @@ cc_library(
"ares_setup.h",
"ares_strcasecmp.h",
"ares_strdup.h",
"ares_strsplit.h",
"ares_version.h",
"bitncmp.h",
"config-win32.h",

3
third_party/cares/config_android/ares_config.h vendored
Unescape View File

@ -338,6 +338,9 @@
/* Define to 1 if you have the ws2tcpip.h header file. */
/* #undef HAVE_WS2TCPIP_H */
/* Define if __system_property_get exists. */
/* #undef HAVE___SYSTEM_PROPERTY_GET */
/* Define to 1 if you need the malloc.h header file even with stdlib.h */
/* #undef NEED_MALLOC_H */

3
third_party/cares/config_darwin/ares_config.h vendored
Unescape View File

@ -333,6 +333,9 @@
/* Define to 1 if you have the ws2tcpip.h header file. */
/* #undef HAVE_WS2TCPIP_H */
/* Define if __system_property_get exists. */
/* #undef HAVE___SYSTEM_PROPERTY_GET */
/* Define to 1 if you need the malloc.h header file even with stdlib.h */
/* #undef NEED_MALLOC_H */

3
third_party/cares/config_freebsd/ares_config.h vendored
Unescape View File

@ -338,6 +338,9 @@
/* Define to 1 if you have the ws2tcpip.h header file. */
/* #undef HAVE_WS2TCPIP_H */
/* Define if __system_property_get exists. */
/* #undef HAVE___SYSTEM_PROPERTY_GET */
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#define LT_OBJDIR ".libs/"

3
third_party/cares/config_linux/ares_config.h vendored
Unescape View File

@ -338,6 +338,9 @@
/* Define to 1 if you have the ws2tcpip.h header file. */
/* #undef HAVE_WS2TCPIP_H */
/* Define if __system_property_get exists. */
/* #undef HAVE___SYSTEM_PROPERTY_GET */
/* Define to 1 if you need the malloc.h header file even with stdlib.h */
/* #undef NEED_MALLOC_H */

3
third_party/cares/config_openbsd/ares_config.h vendored
Unescape View File

@ -338,6 +338,9 @@
/* Define to 1 if you have the ws2tcpip.h header file. */
/* #undef HAVE_WS2TCPIP_H */
/* Define if __system_property_get exists. */
/* #undef HAVE___SYSTEM_PROPERTY_GET */
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#define LT_OBJDIR ".libs/"

3
third_party/cares/config_windows/ares_config.h vendored
Unescape View File

@ -331,6 +331,9 @@
/* Define to 1 if you have the ws2tcpip.h header file. */
#define HAVE_WS2TCPIP_H
/* Define if __system_property_get exists. */
/* #undef HAVE___SYSTEM_PROPERTY_GET */
/* Define to 1 if you need the malloc.h header file even with stdlib.h */
/* #undef NEED_MALLOC_H */

1
tools/run_tests/generated/sources_and_headers.json
Unescape View File

@ -7468,6 +7468,7 @@
"third_party/cares/cares/ares_setup.h",
"third_party/cares/cares/ares_strcasecmp.h",
"third_party/cares/cares/ares_strdup.h",
"third_party/cares/cares/ares_strsplit.h",
"third_party/cares/cares/ares_version.h",
"third_party/cares/cares/bitncmp.h",
"third_party/cares/cares/config-win32.h",

2
tools/run_tests/sanity/check_submodules.sh
Unescape View File

@ -31,7 +31,7 @@ cat << EOF | awk '{ print $1 }' | sort > "$want_submodules"
73594cde8c9a52a102c4341c244c833aa61b9c06 third_party/bloaty (remotes/origin/wide-14-g73594cd)
b29b21a81b32ec273f118f589f46d56ad3332420 third_party/boringssl (remotes/origin/chromium-stable)
afc30d43eef92979b05776ec0963c9cede5fb80f third_party/boringssl-with-bazel (fips-20180716-116-gafc30d43e)
3be1924221e1326df520f8498d704a5c4c8d0cce third_party/cares/cares (cares-1_13_0)
e982924acee7f7313b4baa4ee5ec000c5e373c30 third_party/cares/cares (cares-1_15_0)
911001cdca003337bdb93fab32740cde61bafee3 third_party/data-plane-api (heads/master)
28f50e0fed19872e0fd50dd23ce2ee8cd759338e third_party/gflags (v2.2.0-5-g30dbc81)
80ed4d0bbf65d57cc267dfc63bd2584557f11f9b third_party/googleapis (common-protos-1_3_1-915-g80ed4d0bb)

Write Preview
Loading…
Cancel
Save