summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCasey Bodley <cbodley@redhat.com>2023-11-27 16:42:06 +0100
committerCasey Bodley <cbodley@redhat.com>2024-02-07 17:13:21 +0100
commit84af8357d1505c1b52cada7e4cdd4ad6e79e2382 (patch)
treeac914eac13b0b0d773aa9ccdf7cc1f77d98d5851
parentcompressor: move QatAccel out of common (diff)
downloadceph-84af8357d1505c1b52cada7e4cdd4ad6e79e2382.tar.xz
ceph-84af8357d1505c1b52cada7e4cdd4ad6e79e2382.zip
cmake: WITH_QATLIB/ZIP disabled on aarch64
Signed-off-by: Casey Bodley <cbodley@redhat.com>
-rw-r--r--CMakeLists.txt6
-rw-r--r--cmake/modules/BuildQAT.cmake2
2 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b40a47d4c13..d70d471ab81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -307,10 +307,12 @@ endif()
option(WITH_BLUEFS "libbluefs library" OFF)
-option(WITH_QATLIB "Enable QAT with qatlib" ON)
+CMAKE_DEPENDENT_OPTION(WITH_QATLIB "Enable QAT with qatlib" ON
+ "NOT CMAKE_SYSTEM_PROCESSOR MATCHES aarch64" OFF)
option(WITH_SYSTEM_QATLIB "Use system packages for qatlib" OFF)
option(WITH_QATDRV "Enable QAT with out-of-tree driver" OFF)
-option(WITH_QATZIP "Enable QATzip" ON)
+CMAKE_DEPENDENT_OPTION(WITH_QATZIP "Enable QATzip" ON
+ "NOT CMAKE_SYSTEM_PROCESSOR MATCHES aarch64" OFF)
option(WITH_SYSTEM_QATZIP "Use system packages for QATzip" OFF)
if(WITH_QATDRV)
diff --git a/cmake/modules/BuildQAT.cmake b/cmake/modules/BuildQAT.cmake
index 737c63c3ea8..d65d07639dc 100644
--- a/cmake/modules/BuildQAT.cmake
+++ b/cmake/modules/BuildQAT.cmake
@@ -13,8 +13,6 @@ function(build_qat)
set(configure_cmd env CC=${CMAKE_C_COMPILER} ./configure --prefix=${QAT_INSTALL_DIR})
# disable systemd or 'make install' tries to write /usr/lib/systemd/system/qat.service
list(APPEND configure_cmd --disable-systemd)
- # samples don't build on arm64
- list(APPEND configure_cmd --disable-samples)
# build a static library with -fPIC that we can link into crypto/compressor plugins
list(APPEND configure_cmd --with-pic --enable-static --disable-shared)