]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
script/run-make: enable WITH_SYSTEM_ZSTD on focal
authorKefu Chai <kchai@redhat.com>
Wed, 31 Mar 2021 04:27:44 +0000 (12:27 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 31 Mar 2021 04:53:39 +0000 (12:53 +0800)
to speed up the build for "make check"

Signed-off-by: Kefu Chai <kchai@redhat.com>
debian/control
src/script/run-make.sh

index 867096e77d9e0d786ff4f2be05c5687718e4d0d9..10a8cb34dc446b33b673ea566b52c49be0b64e0b 100644 (file)
@@ -68,6 +68,7 @@ Build-Depends: automake,
                librabbitmq-dev,
                librdkafka-dev,
                luarocks,
+# Make-Check   libzstd-dev,
 # Make-Check   libxmlsec1,
 # Make-Check   libxmlsec1-nss,
 # Make-Check   libxmlsec1-openssl,
index 9503b8b35bf58ff753b74735a21074be85877d30..3437d715aa9a62889b8559083fef309b658865dd 100755 (executable)
@@ -43,8 +43,13 @@ function detect_ceph_dev_pkgs() {
     fi
 
     source /etc/os-release
-    if [[ "$ID" == "ubuntu" ]] && [[ "$VERSION" =~ .*Xenial*. ]]; then 
-        cmake_opts+=" -DWITH_RADOSGW_KAFKA_ENDPOINT=NO"
+    if [[ "$ID" == "ubuntu" ]]; then
+        case "$VERSION" in
+            *Xenial*)
+                cmake_opts+=" -DWITH_RADOSGW_KAFKA_ENDPOINT=OFF";;
+            *Focal*)
+                cmake_opts+=" -DWITH_SYSTEM_ZSTD=ON";;
+        esac
     fi
     echo "$cmake_opts"
 }