From db9abac87e9f97cd0e75822f280d0cb4778d75ca Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 31 Mar 2021 12:27:44 +0800 Subject: [PATCH] script/run-make: enable WITH_SYSTEM_ZSTD on focal to speed up the build for "make check" Signed-off-by: Kefu Chai (cherry picked from commit f1eda0b99422348865b63826a31f2a6c7078adce) Conflicts: debian/control src/script/run-make.sh: trivial resolution --- debian/control | 1 + src/script/run-make.sh | 8 ++++++++ 2 files changed, 9 insertions(+) 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" } -- 2.47.3