From f1eda0b99422348865b63826a31f2a6c7078adce 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 --- debian/control | 1 + src/script/run-make.sh | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 867096e77d9e..10a8cb34dc44 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 9503b8b35bf5..3437d715aa9a 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" } -- 2.47.3