From: Kefu Chai <kchai@redhat.com>
Date: Wed, 31 Mar 2021 04:27:44 +0000 (+0800)
Subject: script/run-make: enable WITH_SYSTEM_ZSTD on focal
X-Git-Tag: v17.1.0~2422^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F40515%2Fhead;p=ceph.git

script/run-make: enable WITH_SYSTEM_ZSTD on focal

to speed up the build for "make check"

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/debian/control b/debian/control
index 867096e77d9..10a8cb34dc4 100644
--- a/debian/control
+++ b/debian/control
@@ -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,
diff --git a/src/script/run-make.sh b/src/script/run-make.sh
index 9503b8b35bf..3437d715aa9 100755
--- a/src/script/run-make.sh
+++ b/src/script/run-make.sh
@@ -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"
 }