diff options
| author | Roman Nozdrin <roman.nozdrin@mariadb.com> | 2020-11-10 07:54:22 +0000 |
|---|---|---|
| committer | Roman Nozdrin <roman.nozdrin@mariadb.com> | 2020-11-19 13:52:33 +0000 |
| commit | a16e3c326d25a6e30b9fc35ccf7ea8b4a4c61f64 (patch) | |
| tree | 2d9d747dd5d547d3d9074a62c98ea00b22602f01 | |
| parent | 3b486c28f710940631b5cb7a9781965827fbfa4b (diff) | |
| download | mariadb-git-a16e3c326d25a6e30b9fc35ccf7ea8b4a4c61f64.tar.gz | |
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
| -rwxr-xr-x | debian/rules | 4 | ||||
| -rw-r--r-- | storage/columnstore/CMakeLists.txt | 4 | ||||
| m--------- | storage/columnstore/columnstore | 0 |
3 files changed, 3 insertions, 5 deletions
diff --git a/debian/rules b/debian/rules index 9b9540be012..e4c9963efb3 100755 --- a/debian/rules +++ b/debian/rules @@ -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 diff --git a/storage/columnstore/CMakeLists.txt b/storage/columnstore/CMakeLists.txt index 63d9d3b7a6a..77ba817c837 100644 --- a/storage/columnstore/CMakeLists.txt +++ b/storage/columnstore/CMakeLists.txt @@ -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) diff --git a/storage/columnstore/columnstore b/storage/columnstore/columnstore -Subproject a91c4d00d931b2e7dacc4f3ad6070906ddefff1 +Subproject 8d1fb3ed2f1a62805cfbf09ff110e66d6619e8e |