mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
f11a7bc14b
Bug: https://bugs.gentoo.org/971594 Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr> Part-of: https://codeberg.org/gentoo/gentoo/pulls/1026 Signed-off-by: Sam James <sam@gentoo.org>
43 lines
2.4 KiB
Diff
43 lines
2.4 KiB
Diff
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/CMakeLists.txt
|
|
+++ b/storage/columnstore/columnstore/CMakeLists.txt
|
|
@@ -97,7 +97,7 @@ SET (ENGINE_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR})
|
|
INCLUDE(columnstore_version)
|
|
INCLUDE(misc)
|
|
|
|
-FIND_PACKAGE(Boost 1.53.0 COMPONENTS system filesystem thread regex date_time chrono atomic)
|
|
+FIND_PACKAGE(Boost 1.53.0 COMPONENTS filesystem thread regex date_time chrono atomic)
|
|
IF (NOT Boost_FOUND)
|
|
MESSAGE_ONCE(CS_NO_BOOST "Required Boost libraries not found!")
|
|
return()
|
|
--- a/storage/columnstore/columnstore/cmake/boost.cmake
|
|
+++ b/storage/columnstore/columnstore/cmake/boost.cmake
|
|
@@ -31,4 +31,4 @@ unset(_exec_ret)
|
|
|
|
set(BOOST_ROOT ${CMAKE_CURRENT_BINARY_DIR}/boost)
|
|
|
|
-find_package(Boost 1.55.0 REQUIRED COMPONENTS system filesystem thread regex date_time)
|
|
+find_package(Boost 1.55.0 REQUIRED COMPONENTS filesystem thread regex date_time)
|
|
--- a/storage/columnstore/columnstore/storage-manager/CMakeLists.txt
|
|
+++ b/storage/columnstore/columnstore/storage-manager/CMakeLists.txt
|
|
@@ -62,7 +62,7 @@ set(CMAKE_INSTALL_RPATH $ORIGIN $ORIGIN/../lib)
|
|
add_library(storagemanager SHARED ${storagemanager_SRCS})
|
|
add_dependencies(storagemanager marias3)
|
|
target_compile_definitions(storagemanager PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS)
|
|
-target_link_libraries(storagemanager boost_chrono boost_system boost_thread boost_filesystem boost_regex pthread ${S3API_DEPS})
|
|
+target_link_libraries(storagemanager boost_chrono boost_thread boost_filesystem boost_regex pthread ${S3API_DEPS})
|
|
set_property(TARGET storagemanager PROPERTY CXX_STANDARD 11)
|
|
|
|
add_executable(StorageManager src/main.cpp)
|
|
--- a/storage/columnstore/columnstore/tools/rebuildEM/CMakeLists.txt
|
|
+++ b/storage/columnstore/columnstore/tools/rebuildEM/CMakeLists.txt
|
|
@@ -2,5 +2,5 @@ include_directories(${ENGINE_COMMON_INCLUDES})
|
|
|
|
set(rebuildEM_SRCS main.cpp rebuildEM.cpp)
|
|
add_executable(mcsRebuildEM ${rebuildEM_SRCS})
|
|
-target_link_libraries(mcsRebuildEM ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${MARIADB_CLIENT_LIBS} boost_filesystem boost_system)
|
|
+target_link_libraries(mcsRebuildEM ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${MARIADB_CLIENT_LIBS} boost_filesystem)
|
|
install(TARGETS mcsRebuildEM DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
|