Commit a16e3c32 authored by Roman Nozdrin's avatar Roman Nozdrin

Update MCS to resolve libmarias3 compulation for centos74-amd64-debug

pipeline in community BB

Fix for rebuild from source step

Disable MCS on i386|i686 platforms

This patch puts MCS debian packaging files and part of debian/control
into the engine directory
parent 3b486c28
......@@ -49,8 +49,8 @@ ifeq (32,$(DEB_HOST_ARCH_BITS))
endif
# ColumnStore only attempts to build on a few platforms as dictated by CMake checks
# Also note in debian/control the CS-only build deps marked '[i386 amd64]'
ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),amd64 i386))
# Also note in debian/control the CS-only build deps marked '[amd64]'
ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),amd64))
CMAKEFLAGS += -DPLUGIN_COLUMNSTORE=YES
endif
......
......@@ -12,9 +12,7 @@ macro(APPEND_FOR_CPACK V)
endmacro()
IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR
CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64" OR
CMAKE_SYSTEM_PROCESSOR STREQUAL "i386" OR
CMAKE_SYSTEM_PROCESSOR STREQUAL "i686")
CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64")
add_subdirectory(columnstore)
IF(TARGET columnstore)
......
Subproject commit a91c4d00d931b2e7dacc4f3ad6070906ddefff14
Subproject commit 8d1fb3ed2f1a62805cfbf09ff110e66d6619e8e3
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment