aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbugaevskiy <bugaevskiy@yandex-team.com>2022-09-11 19:28:07 +0300
committerbugaevskiy <bugaevskiy@yandex-team.com>2022-09-11 19:28:07 +0300
commit98a6390ee5c37d5c326956bc8494581364d8c11b (patch)
tree905c352702680353118cce2b4de5ff40b730552a
parent269d61cb11390c773c2b69ec4e3326fd3a78dfa6 (diff)
downloadydb-98a6390ee5c37d5c326956bc8494581364d8c11b.tar.gz
Remove boost/multiprecision from metaproject
-rw-r--r--contrib/libs/apache/arrow/CMakeLists.txt2
-rw-r--r--contrib/libs/apache/arrow/cpp/src/parquet/thrift_internal.h2
-rw-r--r--contrib/restricted/boost/CMakeLists.txt1
3 files changed, 2 insertions, 3 deletions
diff --git a/contrib/libs/apache/arrow/CMakeLists.txt b/contrib/libs/apache/arrow/CMakeLists.txt
index bae344e8b29..b23a330225b 100644
--- a/contrib/libs/apache/arrow/CMakeLists.txt
+++ b/contrib/libs/apache/arrow/CMakeLists.txt
@@ -42,7 +42,6 @@ target_include_directories(libs-apache-arrow PRIVATE
${CMAKE_SOURCE_DIR}/contrib/libs/re2
${CMAKE_SOURCE_DIR}/contrib/libs/utf8proc
${CMAKE_SOURCE_DIR}/contrib/libs/zstd/include
- ${CMAKE_SOURCE_DIR}/contrib/restricted/boost
)
target_link_libraries(libs-apache-arrow PUBLIC
contrib-libs-cxxsupp
@@ -59,6 +58,7 @@ target_link_libraries(libs-apache-arrow PUBLIC
ZLIB::ZLIB
contrib-libs-zstd
contrib-restricted-boost
+ restricted-boost-multiprecision
contrib-restricted-fast_float
contrib-restricted-thrift
contrib-restricted-uriparser
diff --git a/contrib/libs/apache/arrow/cpp/src/parquet/thrift_internal.h b/contrib/libs/apache/arrow/cpp/src/parquet/thrift_internal.h
index ea7df209621..14cb51bacc7 100644
--- a/contrib/libs/apache/arrow/cpp/src/parquet/thrift_internal.h
+++ b/contrib/libs/apache/arrow/cpp/src/parquet/thrift_internal.h
@@ -23,7 +23,7 @@
// Check if thrift version < 0.11.0
// or if FORCE_BOOST_SMART_PTR is defined. Ref: https://thrift.apache.org/lib/cpp
#if defined(PARQUET_THRIFT_USE_BOOST) || defined(FORCE_BOOST_SMART_PTR)
-#include <boost/shared_ptr.hpp>
+#error #include <boost/shared_ptr.hpp>
#else
#include <memory>
#endif
diff --git a/contrib/restricted/boost/CMakeLists.txt b/contrib/restricted/boost/CMakeLists.txt
index d3b73c29161..bd2bd7dd07b 100644
--- a/contrib/restricted/boost/CMakeLists.txt
+++ b/contrib/restricted/boost/CMakeLists.txt
@@ -127,7 +127,6 @@ target_link_libraries(contrib-restricted-boost INTERFACE
restricted-boost-mpl
restricted-boost-multi_array
restricted-boost-multi_index
- restricted-boost-multiprecision
restricted-boost-numeric_conversion
restricted-boost-optional
restricted-boost-parameter