From 91be72dbb447a1db690d2d6ed4f9815e8d226ab3 Mon Sep 17 00:00:00 2001
From: zvonand <azvonov@altinity.com>
Date: Sun, 17 Jul 2022 12:17:16 +0200
Subject: [PATCH] updated

---
 contrib/CMakeLists.txt              |  1 +
 contrib/base-x                      |  1 +
 contrib/base-x-cmake/CMakeLists.txt | 28 ++++++++++++++++++++++++++++
 contrib/jemalloc                    |  2 +-
 contrib/libprotobuf-mutator         |  2 +-
 contrib/poco                        |  2 +-
 contrib/simdjson                    |  2 +-
 contrib/thrift                      |  2 +-
 8 files changed, 35 insertions(+), 5 deletions(-)
 create mode 160000 contrib/base-x
 create mode 100644 contrib/base-x-cmake/CMakeLists.txt

diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 489f788a512..d4a3f164214 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -156,6 +156,7 @@ endif()
 
 add_contrib (sqlite-cmake sqlite-amalgamation)
 add_contrib (s2geometry-cmake s2geometry)
+add_contrib (base-x-cmake base-x)
 
 # Put all targets defined here and in subdirectories under "contrib/<immediate-subdir>" folders in GUI-based IDEs.
 # Some of third-party projects may override CMAKE_FOLDER or FOLDER property of their targets, so they would not appear
diff --git a/contrib/base-x b/contrib/base-x
new file mode 160000
index 00000000000..a85f98fb4ed
--- /dev/null
+++ b/contrib/base-x
@@ -0,0 +1 @@
+Subproject commit a85f98fb4ed52c2f4029a4b6ac1ef0bafdfc56f5
diff --git a/contrib/base-x-cmake/CMakeLists.txt b/contrib/base-x-cmake/CMakeLists.txt
new file mode 100644
index 00000000000..b0c11a176c6
--- /dev/null
+++ b/contrib/base-x-cmake/CMakeLists.txt
@@ -0,0 +1,28 @@
+option (ENABLE_BASEX "Enable base-x" ${ENABLE_LIBRARIES})
+
+if (NOT ENABLE_BASEX)
+    message(STATUS "Not using base-x")
+    return()
+endif()
+
+set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/base-x")
+
+set (SRCS
+        ${LIBRARY_DIR}/base_x.hh
+        ${LIBRARY_DIR}/uinteger_t.hh
+        )
+
+add_library(_base-x INTERFACE)
+target_include_directories(_base-x SYSTEM BEFORE INTERFACE "${ClickHouse_SOURCE_DIR}/contrib/base-x")
+
+if (XCODE OR XCODE_VERSION)
+    # https://gitlab.kitware.com/cmake/cmake/issues/17457
+    #     Some native build systems may not like targets that have only object files, so consider adding at least one real source file
+    # This applies to Xcode.
+    if (NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/dummy.c")
+        file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/dummy.c" "")
+    endif ()
+    target_sources(_base-x PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/dummy.c")
+endif ()
+
+add_library(ch_contrib::base-x ALIAS _base-x)
\ No newline at end of file
diff --git a/contrib/jemalloc b/contrib/jemalloc
index 78b58379c85..41a859ef732 160000
--- a/contrib/jemalloc
+++ b/contrib/jemalloc
@@ -1 +1 @@
-Subproject commit 78b58379c854a639df79beb3289351129d863d4b
+Subproject commit 41a859ef7325569c6c25f92d294d45123bb81355
diff --git a/contrib/libprotobuf-mutator b/contrib/libprotobuf-mutator
index ffd86a32874..a304ec48dcf 160000
--- a/contrib/libprotobuf-mutator
+++ b/contrib/libprotobuf-mutator
@@ -1 +1 @@
-Subproject commit ffd86a32874e5c08a143019aad1aaf0907294c9f
+Subproject commit a304ec48dcf15d942607032151f7e9ee504b5dcf
diff --git a/contrib/poco b/contrib/poco
index 0e32cb42db7..9fec8e11dbb 160000
--- a/contrib/poco
+++ b/contrib/poco
@@ -1 +1 @@
-Subproject commit 0e32cb42db76ddaa76848470219056908053b676
+Subproject commit 9fec8e11dbb6a352e1cfba8cc9e23ebd7fb77310
diff --git a/contrib/simdjson b/contrib/simdjson
index de196dd7a3a..1075e8609c4 160000
--- a/contrib/simdjson
+++ b/contrib/simdjson
@@ -1 +1 @@
-Subproject commit de196dd7a3a16e4056b0551ffa3b85c2f52581e1
+Subproject commit 1075e8609c4afa253162d441437af929c29e31bb
diff --git a/contrib/thrift b/contrib/thrift
index 010ccf0a0c7..2a93df80f27 160000
--- a/contrib/thrift
+++ b/contrib/thrift
@@ -1 +1 @@
-Subproject commit 010ccf0a0c7023fea0f6bf4e4078ebdff7e61982
+Subproject commit 2a93df80f27739ccabb5b885cb12a8dc7595ecdf