From 3252228852acfbf633ae5dd7748bdc95a2c00a3c Mon Sep 17 00:00:00 2001 From: Benjamin Naecker Date: Fri, 14 May 2021 18:56:16 -0700 Subject: [PATCH] Updates submodules bringing in several upstream changes to build on illumos --- .gitmodules | 1 + contrib/boringssl | 2 +- contrib/cppkafka | 2 +- contrib/grpc | 2 +- contrib/poco | 2 +- contrib/rocksdb | 2 +- contrib/zlib-ng | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index f7dcf5f4ac1..66a2370f0da 100644 --- a/.gitmodules +++ b/.gitmodules @@ -17,6 +17,7 @@ [submodule "contrib/zlib-ng"] path = contrib/zlib-ng url = https://github.com/ClickHouse-Extras/zlib-ng.git + branch = clickhouse-new [submodule "contrib/googletest"] path = contrib/googletest url = https://github.com/google/googletest.git diff --git a/contrib/boringssl b/contrib/boringssl index 83c1cda8a02..a6a2e2ab3e4 160000 --- a/contrib/boringssl +++ b/contrib/boringssl @@ -1 +1 @@ -Subproject commit 83c1cda8a0224dc817cbad2966c7ed4acc35f02a +Subproject commit a6a2e2ab3e44d97ce98e51c558e989f211de7eb3 diff --git a/contrib/cppkafka b/contrib/cppkafka index b06e64ef5bf..57a599d99c5 160000 --- a/contrib/cppkafka +++ b/contrib/cppkafka @@ -1 +1 @@ -Subproject commit b06e64ef5bffd636d918a742c689f69130c1dbab +Subproject commit 57a599d99c540e647bcd0eb9ea77c523cca011b3 diff --git a/contrib/grpc b/contrib/grpc index 1085a941238..5b79aae85c5 160000 --- a/contrib/grpc +++ b/contrib/grpc @@ -1 +1 @@ -Subproject commit 1085a941238e66b13e3fb89c310533745380acbc +Subproject commit 5b79aae85c515e0df4abfb7b1e07975fdc7cecc1 diff --git a/contrib/poco b/contrib/poco index b7d9ec16ee3..59945069080 160000 --- a/contrib/poco +++ b/contrib/poco @@ -1 +1 @@ -Subproject commit b7d9ec16ee33ca76643d5fcd907ea9a33285640a +Subproject commit 5994506908028612869fee627d68d8212dfe7c1e diff --git a/contrib/rocksdb b/contrib/rocksdb index 54a0decabbc..07c77549a20 160000 --- a/contrib/rocksdb +++ b/contrib/rocksdb @@ -1 +1 @@ -Subproject commit 54a0decabbcf4c0bb5cf7befa9c597f28289bff5 +Subproject commit 07c77549a20b63ff6981b400085eba36bb5c80c4 diff --git a/contrib/zlib-ng b/contrib/zlib-ng index 5cc4d232020..db232d30b4c 160000 --- a/contrib/zlib-ng +++ b/contrib/zlib-ng @@ -1 +1 @@ -Subproject commit 5cc4d232020dc66d1d6c5438834457e2a2f6127b +Subproject commit db232d30b4c72fd58e6d7eae2d12cebf9c3d90db