Skip to content

Commit a16e3c3

Browse files
committed
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
1 parent 3b486c2 commit a16e3c3

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

debian/rules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ ifeq (32,$(DEB_HOST_ARCH_BITS))
4949
endif
5050

5151
# ColumnStore only attempts to build on a few platforms as dictated by CMake checks
52-
# Also note in debian/control the CS-only build deps marked '[i386 amd64]'
53-
ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),amd64 i386))
52+
# Also note in debian/control the CS-only build deps marked '[amd64]'
53+
ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),amd64))
5454
CMAKEFLAGS += -DPLUGIN_COLUMNSTORE=YES
5555
endif
5656

storage/columnstore/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ macro(APPEND_FOR_CPACK V)
1212
endmacro()
1313

1414
IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR
15-
CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64" OR
16-
CMAKE_SYSTEM_PROCESSOR STREQUAL "i386" OR
17-
CMAKE_SYSTEM_PROCESSOR STREQUAL "i686")
15+
CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64")
1816
add_subdirectory(columnstore)
1917

2018
IF(TARGET columnstore)

storage/columnstore/columnstore

Submodule columnstore updated 62 files

0 commit comments

Comments
 (0)