VladPolskiy/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-15 22:23:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(build): compile boost with gcc only [develop-23.02] (#3393)

Browse Source 
* chore(build): compile boost with gcc only

* chore(build): compile boost with gcc only debian11

* chore(build): bump boost version
This commit is contained in:
Leonid Fedorov
2025-01-25 19:17:37 +04:00
committed by GitHub
parent 85f2d4eff1
commit 7980057766
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.drone.jsonnet
View File

@ -66,7 +66,7 @@ local platformMap(platform, arch) =
local platform_map = {
'rockylinux:8': rockylinux8_build_deps + ' && dnf ' + rpm_build_deps + ' && cmake ' + cmakeflags + ' -DRPM=rockylinux8 && sleep $${BUILD_DELAY_SECONDS:-1s} && make -j$(nproc) package',
'rockylinux:9': rockylinux9_build_deps + ' && dnf ' + rpm_build_deps + ' && cmake ' + cmakeflags + ' -DRPM=rockylinux9 && sleep $${BUILD_DELAY_SECONDS:-1s} && make -j$(nproc) package',
'debian:11': bootstrap_deps + ' && ' + deb_build_deps + ' && ' + debian11_deps + ' && ' + turnon_clang + " && sleep $${BUILD_DELAY_SECONDS:-1s} && CMAKEFLAGS='" + cmakeflags + " -DDEB=bullseye' debian/autobake-deb.sh",
'debian:11': bootstrap_deps + ' && ' + deb_build_deps + ' && ' + debian11_deps + " && sleep $${BUILD_DELAY_SECONDS:-1s} && CMAKEFLAGS='" + cmakeflags + " -DDEB=bullseye' debian/autobake-deb.sh",
'ubuntu:20.04': bootstrap_deps + ' && ' + deb_build_deps + ' && ' + ubuntu20_04_deps + " && sleep $${BUILD_DELAY_SECONDS:-1s} && CMAKEFLAGS='" + cmakeflags + " -DDEB=focal' debian/autobake-deb.sh",
'ubuntu:22.04': bootstrap_deps + ' && ' + deb_build_deps + " && sleep $${BUILD_DELAY_SECONDS:-1s} && CMAKEFLAGS='" + cmakeflags + " -DDEB=jammy' debian/autobake-deb.sh",
};

2
CMakeLists.txt
View File

@ -50,7 +50,7 @@ INCLUDE(check_compiler_flag)
INCLUDE(ExternalProject)
INCLUDE(CheckCXXSourceCompiles)
FIND_PACKAGE(Boost 1.79.0 COMPONENTS chrono filesystem program_options regex system thread)
FIND_PACKAGE(Boost 1.84.0 COMPONENTS chrono filesystem program_options regex system thread)
IF (NOT Boost_FOUND OR Boost_VERSION VERSION_GREATER 1.76.99)
MY_CHECK_CXX_COMPILER_FLAG("-std=c++20")

6
cmake/boost.cmake
View File

@ -22,7 +22,7 @@ SET(Boost_LIBRARY_DIRS "${INSTALL_LOCATION}/lib")
LINK_DIRECTORIES("${Boost_LIBRARY_DIRS}")
set(_cxxargs "-fPIC -DBOOST_NO_AUTO_PTR -fvisibility=default")
set(_b2args cxxflags=${_cxxargs};cflags=-fPIC;threading=multi;${_extra};toolset=${_toolset} --without-python;--prefix=${INSTALL_LOCATION})
set(_b2args cxxflags=${_cxxargs};cflags=-fPIC;threading=multi;${_extra}; --without-python;--prefix=${INSTALL_LOCATION})
SET(byproducts)
FOREACH(name chrono filesystem program_options regex system thread)
@ -37,8 +37,8 @@ ENDFOREACH()
ExternalProject_Add(external_boost
PREFIX .boost
URL https://archives.boost.io/release/1.79.0/source/boost_1_79_0.tar.bz2
URL_HASH SHA256=475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39
URL https://archives.boost.io/release/1.84.0/source/boost_1_84_0.tar.gz
URL_HASH SHA256=a5800f405508f5df8114558ca9855d2640a2de8f0445f051fa1c7c3383045724
CONFIGURE_COMMAND ./bootstrap.sh
UPDATE_COMMAND ""
BUILD_COMMAND ./b2 -q ${_b2args}