(mesos) branch master updated: [build] Fix docker-build.sh failing to compile with distcheck.

[bmahler]

This is an automated email from the ASF dual-hosted git repository.

bmahler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git


The following commit(s) were added to refs/heads/master by this push:
     new abc38a685 [build] Fix docker-build.sh failing to compile with 
distcheck.
abc38a685 is described below

commit abc38a685d9a7ffb1196e1c0d6b58eff296702af
Author: Jason Zhou <jasonzhou...@gmail.com>
AuthorDate: Tue Jul 2 17:55:05 2024 -0400

    [build] Fix docker-build.sh failing to compile with distcheck.
    
    Review: https://reviews.apache.org/r/75066/
---
 support/docker-build.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/support/docker-build.sh b/support/docker-build.sh
index 1273848d9..cb0b05b6e 100755
--- a/support/docker-build.sh
+++ b/support/docker-build.sh
@@ -78,7 +78,17 @@ case $OS in
 
     # Install dependencies.
     # IBM Power only supports Ubuntu 14.04 and gcc compiler.
-    [ "$(uname -m)" = "x86_64" ] && CLANG_PKG=clang-3.5 || CLANG_PKG=
+    if [ "$(uname -m)" = "x86_64" ]; then
+      # We install clang-10 on non-ubuntu-16.04 systems because newer OS
+      # no longer support clang 3.5
+      if [[ "$OS" = "ubuntu:16.04" ]]; then
+        CLANG_PKG=clang-3.5
+      else
+        CLANG_PKG=clang-10
+      fi
+    else
+      CLANG_PKG=
+    fi
     append_dockerfile "RUN apt-get update"
     append_dockerfile "RUN apt-get install -y build-essential $CLANG_PKG git 
maven autoconf libtool software-properties-common"
     append_dockerfile "RUN apt-get install -y python-dev python-six 
libcurl4-nss-dev libsasl2-dev libapr1-dev libsvn-dev libevent-dev libev-dev 
libssl-dev"