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: v14.2.22~27^2~15^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F40516%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>
(cherry picked from commit f1eda0b99422348865b63826a31f2a6c7078adce)

Conflicts:
	debian/control
	src/script/run-make.sh: trivial resolution
---

diff --git a/debian/control b/debian/control
index 855e969c846b..d9bb3755274d 100644
--- a/debian/control
+++ b/debian/control
@@ -51,6 +51,7 @@ Build-Depends: cmake (>= 3.5),
                libxml2-dev,
                librabbitmq-dev,
                librdkafka-dev,
+# 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 d5c2e08e9842..9fca631b0b84 100755
--- a/src/script/run-make.sh
+++ b/src/script/run-make.sh
@@ -41,6 +41,14 @@ function detect_ceph_dev_pkgs() {
     else
         cmake_opts+=" -DBOOST_J=$(get_processors)"
     fi
+
+    source /etc/os-release
+    if [[ "$ID" == "ubuntu" ]]; then
+        case "$VERSION" in
+            *Focal*)
+                cmake_opts+=" -DWITH_SYSTEM_ZSTD=ON";;
+        esac
+    fi
     echo "$cmake_opts"
 }