Skip to content

Commit

Permalink
MDEV-33290: Disable ColumnStore based on boost version
Browse files Browse the repository at this point in the history
MCOL-5611 supporting with Boost-1.80, the version "next_prime"
disappears from https://github.com/boostorg/unordered/blob/boost-1.79.0/include/boost/unordered/detail/implementation.hpp
makes it the currenly highest supported versions.

Lets check this version.

While CMake-3.19+ supports version ranges in package determinations this
isn't supported for Boost in Cmake-3.28. So we check for the 1.80 and
don't compile ColumnStore.
  • Loading branch information
grooverdan committed Jan 23, 2024
1 parent 13e49b7 commit 5ce6a35
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions storage/columnstore/CMakeLists.txt
Expand Up @@ -15,6 +15,13 @@ IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR
CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64")
add_subdirectory(columnstore)

# https://jira.mariadb.org/browse/MCOL-5611
FIND_PACKAGE(Boost 1.80.0 COMPONENTS system filesystem thread regex date_time chrono atomic)
IF (Boost_FOUND)
MESSAGE_ONCE(CS_NO_BOOST "Boost Libraries >= 1.80.0 not supported!")
return()
ENDIF()

IF(TARGET columnstore)
# Needed to bump the component changes up to the main scope
APPEND_FOR_CPACK(CPACK_COMPONENTS_ALL)
Expand Down

0 comments on commit 5ce6a35

Please sign in to comment.