Add an explicit server dependency for RPMs and limit builds to x86_64…

… and i386 only.
MariaDB · Jun 19, 2020 · 00bc504 · 00bc504
1 parent 2e6aceb
commit 00bc504
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/storage/columnstore/CMakeLists.txt b/storage/columnstore/CMakeLists.txt
@@ -4,16 +4,21 @@ if("NO" STREQUAL "${PLUGIN_COLUMNSTORE}")
   return()
 endif()
 
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCOLUMNSTORE_MATURITY=MariaDB_PLUGIN_MATURITY_GAMMA")
-add_subdirectory(columnstore)
+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")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCOLUMNSTORE_MATURITY=MariaDB_PLUGIN_MATURITY_GAMMA")
+    add_subdirectory(columnstore)
 
-# Needed to bump the component changes up to the main scope
-SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} PARENT_SCOPE)
-IF (RPM)
-    SET(CPACK_RPM_columnstore-engine_USER_FILELIST ${CPACK_RPM_columnstore-engine_USER_FILELIST} PARENT_SCOPE)
-    SET(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES ${CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES} PARENT_SCOPE)
-    SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE} PARENT_SCOPE)
-    SET(CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE} PARENT_SCOPE)
-    SET(CPACK_RPM_columnstore-engine_PRE_UNINSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_PRE_UNINSTALL_SCRIPT_FILE} PARENT_SCOPE)
-    SET(CPACK_RPM_columnstore-engine_PACKAGE_CONFLICTS thrift  PARENT_SCOPE)
+    # Needed to bump the component changes up to the main scope
+    SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} PARENT_SCOPE)
+    IF (RPM)
+        SET(CPACK_RPM_columnstore-engine_USER_FILELIST ${CPACK_RPM_columnstore-engine_USER_FILELIST} PARENT_SCOPE)
+        SET(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "${CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES}, MariaDB-server >= 10.5.4" PARENT_SCOPE)
+        SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE} PARENT_SCOPE)
+        SET(CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE} PARENT_SCOPE)
+        SET(CPACK_RPM_columnstore-engine_PRE_UNINSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_PRE_UNINSTALL_SCRIPT_FILE} PARENT_SCOPE)
+        SET(CPACK_RPM_columnstore-engine_PACKAGE_CONFLICTS thrift  PARENT_SCOPE)
+    ENDIF()
 ENDIF()