blob: 032493b49ed5f3cfed3c3acb0175e5f41b25c1c7 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
fixed by upstream https://github.com/mariadb-corporation/mariadb-columnstore-engine/pull/3943.patch
https://bugs.gentoo.org/971594
fix building against boost >=1.89
--- a/storage/columnstore/columnstore/cmake/boost.cmake
+++ b/storage/columnstore/columnstore/cmake/boost.cmake
@@ -1,5 +1,5 @@
# Single source of truth for Boost components we need
-set(BOOST_COMPONENTS chrono filesystem program_options regex system thread)
+set(BOOST_COMPONENTS chrono filesystem program_options regex thread)
find_package(Boost 1.88.0 COMPONENTS ${BOOST_COMPONENTS})
--- a/storage/columnstore/columnstore/storage-manager/CMakeLists.txt
+++ b/storage/columnstore/columnstore/storage-manager/CMakeLists.txt
@@ -71,7 +71,6 @@ target_compile_definitions(storagemanager PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS)
columnstore_link(
storagemanager
boost_chrono
- boost_system
boost_thread
boost_filesystem
boost_regex
--- a/storage/columnstore/columnstore/tools/rebuildEM/CMakeLists.txt
+++ b/storage/columnstore/columnstore/tools/rebuildEM/CMakeLists.txt
@@ -2,4 +2,4 @@ include_directories(${ENGINE_COMMON_INCLUDES})
set(rebuildEM_SRCS main.cpp rebuildEM.cpp)
columnstore_executable(mcsRebuildEM ${rebuildEM_SRCS})
-columnstore_link(mcsRebuildEM ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} boost_system boost_filesystem)
+columnstore_link(mcsRebuildEM ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} boost_filesystem)
--- a/storage/columnstore/columnstore/utils/idbdatafile/CMakeLists.txt
+++ b/storage/columnstore/columnstore/utils/idbdatafile/CMakeLists.txt
@@ -14,4 +14,4 @@ set(idbdatafile_LIB_SRCS
)
columnstore_library(idbdatafile ${idbdatafile_LIB_SRCS})
-columnstore_link(idbdatafile PRIVATE ${NETSNMP_LIBRARIES} ${ENGINE_OAM_LIBS} boost_filesystem boost_system)
+columnstore_link(idbdatafile PRIVATE ${NETSNMP_LIBRARIES} ${ENGINE_OAM_LIBS} boost_filesystem)
|
