mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
430d3f3967
remove boost_system requirement that is header-only boost is required w/ columnstore enabled Closes: 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>
47 lines
2.1 KiB
Diff
47 lines
2.1 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/cmake/boost.cmake
|
|
+++ b/storage/columnstore/columnstore/cmake/boost.cmake
|
|
@@ -1,4 +1,4 @@
|
|
-find_package(Boost 1.88.0 COMPONENTS chrono filesystem program_options regex system thread)
|
|
+find_package(Boost 1.88.0 COMPONENTS chrono filesystem program_options regex thread)
|
|
|
|
if(Boost_FOUND)
|
|
add_custom_target(external_boost)
|
|
@@ -27,7 +27,7 @@ set(_b2args cxxflags=${_cxxargs};cflags=-fPIC;threading=multi;${_extra};toolset=
|
|
)
|
|
|
|
set(byproducts)
|
|
-foreach(name chrono filesystem program_options regex system thread)
|
|
+foreach(name chrono filesystem program_options regex thread)
|
|
set(lib boost_${name})
|
|
add_library(${lib} STATIC IMPORTED GLOBAL)
|
|
add_dependencies(${lib} external_boost)
|
|
--- 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 ${ENGINE_OAM_LIBS} boost_filesystem boost_system compress)
|
|
+columnstore_link(idbdatafile PRIVATE ${ENGINE_OAM_LIBS} boost_filesystem compress)
|