tensorflow-arm64-build: Prepare for 2.15 with clang-17

Tensorflow 2.15 will build using clang-17 so make the
preparations for that by installing the needed packages
and adjusting the link options as required.
Also update the tag for 2.15

Change-Id: I4c81e8de1ba962aca0b2aa9f74822eb8ad92ecd7

4 files changed, 9 insertions, 8 deletions

diff --git a/tensorflow-arm64-build/build.sh b/tensorflow-arm64-build/build.sh
index ef6b91e7..e6d8148d 100755
--- a/tensorflow-arm64-build/build.sh
+++ b/tensorflow-arm64-build/build.sh
@@ -4,7 +4,7 @@ set -e
 
 export LANG=C
 
-release_tag=2.14
+release_tag=2.15
 
 docker build --pull \
         --tag=linaro/tensorflow-arm64-build:latest-multipython \
diff --git a/tensorflow-arm64-build/devel.packages.txt b/tensorflow-arm64-build/devel.packages.txt
index b7b9bf40..5d208cc8 100644
--- a/tensorflow-arm64-build/devel.packages.txt
+++ b/tensorflow-arm64-build/devel.packages.txt
@@ -3,10 +3,10 @@ autoconf
 automake
 build-essential
 ca-certificates
-llvm-16
-clang-16
+llvm-17
+clang-17
 clang-format-12
-lld-16
+lld-17
 colordiff
 curl
 ffmpeg
@@ -18,7 +18,7 @@ libcurl3-dev
 libcurl4-openssl-dev
 libfreetype6-dev
 libhdf5-serial-dev
-libomp-16-dev
+libomp-17-dev
 libssl-dev
 libtool
 libxml2-dev
diff --git a/tensorflow-arm64-build/devel.usertools/aarch64_clang.bazelrc b/tensorflow-arm64-build/devel.usertools/aarch64_clang.bazelrc
index 8ffa952f..50b3851d 100644
--- a/tensorflow-arm64-build/devel.usertools/aarch64_clang.bazelrc
+++ b/tensorflow-arm64-build/devel.usertools/aarch64_clang.bazelrc
@@ -20,6 +20,7 @@ build --define=tf_api_version=2 --action_env=TF2_BEHAVIOR=1
 # Use lld as the linker
 build --linkopt="-fuse-ld=lld"
 build --linkopt="-lm"
+build --linkopt="-Wl,--undefined-version"
 
 # Prevent double-compilation of some TF code, ref. b/183279666 (internal)
 # > TF's gen_api_init_files has a genrule to run the core TensorFlow code
diff --git a/tensorflow-arm64-build/setup.sources.sh b/tensorflow-arm64-build/setup.sources.sh
index 629a9895..ea8dc376 100755
--- a/tensorflow-arm64-build/setup.sources.sh
+++ b/tensorflow-arm64-build/setup.sources.sh
@@ -39,7 +39,7 @@ cat >/etc/apt/sources.list.d/custom.list <<SOURCES
 deb http://ppa.launchpad.net/deadsnakes/ppa/ubuntu focal main
 deb-src http://ppa.launchpad.net/deadsnakes/ppa/ubuntu focal main
 
-# LLVM/Clang repository
-deb http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main
-deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main
+# LLVM/Clang 17 repository
+deb http://apt.llvm.org/focal/ llvm-toolchain-focal-17 main
+deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-17 main
 SOURCES