Skip to content

Commit

Permalink
Fix COLUMNSTORE in Debian CI builds
Browse files Browse the repository at this point in the history
Debian building tried to implicitly enable ColumnStore, but it needs to
be explicitly enabled to work. This should fix the AARCH64 BuildBot
builders.

Also add `arm64` to the supported platforms for ColumnStore, that is
what it is identified as in Debian 11.
  • Loading branch information
LinuxJedi committed May 30, 2023
1 parent 4e5b771 commit acfcf9e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion debian/autobake-deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ then
# ColumnStore is explicitly disabled in the native Debian build. Enable it
# now when build is triggered by autobake-deb.sh (MariaDB.org) and when the
# build is not running on Gitlab-CI.
sed '/-DPLUGIN_COLUMNSTORE=NO/d' -i debian/rules
sed 's/-DPLUGIN_COLUMNSTORE=NO/-DPLUGIN_COLUMNSTORE=YES/g' -i debian/rules
# Take the files and part of control from MCS directory
if [ ! -f debian/mariadb-plugin-columnstore.install ]
then
Expand Down
3 changes: 2 additions & 1 deletion storage/columnstore/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ SET_PROPERTY(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "${dirs}")

IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR
CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64" OR
CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" OR
CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
add_subdirectory(columnstore)

IF(TARGET columnstore)
Expand Down

0 comments on commit acfcf9e

Please sign in to comment.