From 63a4722878f1e0cabdfbd5ac20703a15fdc53c56 Mon Sep 17 00:00:00 2001
From: aram price <aram.price@broadcom.com>
Date: Fri, 24 Jan 2025 14:46:48 -0800
Subject: [PATCH] Remove `clang` compiler from noble stemcell

---
 .../spec/assets/dpkg-list-ubuntu-noble.txt    | 10 ---
 .../base_ubuntu_build_essential/apply.sh      |  1 -
 .../assets/generate_dev_tools_file_list.sh    | 12 +---
 .../assets/noble_static_libraries_list.txt    | 70 -------------------
 4 files changed, 1 insertion(+), 92 deletions(-)

diff --git a/bosh-stemcell/spec/assets/dpkg-list-ubuntu-noble.txt b/bosh-stemcell/spec/assets/dpkg-list-ubuntu-noble.txt
index 9501a96e97..18e42846f7 100644
--- a/bosh-stemcell/spec/assets/dpkg-list-ubuntu-noble.txt
+++ b/bosh-stemcell/spec/assets/dpkg-list-ubuntu-noble.txt
@@ -27,8 +27,6 @@ busybox-initramfs
 bzip2
 ca-certificates
 chrony
-clang
-clang-18
 cloud-guest-utils
 cmake
 cmake-data
@@ -163,9 +161,6 @@ libcap2-bin
 libcap2:amd64
 libcbor0.10:amd64
 libcc1-0:amd64
-libclang-common-18-dev:amd64
-libclang-cpp18
-libclang1-18
 libcom-err2:amd64
 libcrack2:amd64
 libcrypt-dev:amd64
@@ -201,7 +196,6 @@ libfile-stripnondeterminism-perl
 libfreetype6:amd64
 libfribidi0:amd64
 libfuse3-3:amd64
-libgc1:amd64
 libgcc-13-dev:amd64
 libgcc-s1:amd64
 libgcrypt20-dev
@@ -242,7 +236,6 @@ libkmod2:amd64
 libkrb5-3:amd64
 libkrb5support0:amd64
 libldap2:amd64
-libllvm18:amd64
 liblmdb0:amd64
 liblocale-gettext-perl
 liblsan0:amd64
@@ -273,8 +266,6 @@ libnl-route-3-200:amd64
 libnpth0t64:amd64
 libnss-systemd:amd64
 libnvme1t64
-libobjc-13-dev:amd64
-libobjc4:amd64
 libp11-kit0:amd64
 libpackagekit-glib2-18:amd64
 libpam-cap:amd64
@@ -363,7 +354,6 @@ libzstd1:amd64
 linux-base
 linux-firmware
 linux-libc-dev:amd64
-llvm-18-linker-tools
 locales
 login
 logrotate
diff --git a/stemcell_builder/stages/base_ubuntu_build_essential/apply.sh b/stemcell_builder/stages/base_ubuntu_build_essential/apply.sh
index f30a2915eb..90ca1ddde7 100755
--- a/stemcell_builder/stages/base_ubuntu_build_essential/apply.sh
+++ b/stemcell_builder/stages/base_ubuntu_build_essential/apply.sh
@@ -10,4 +10,3 @@ debconf="debconf debconf/frontend select noninteractive"
 run_in_chroot $chroot "echo ${debconf} | debconf-set-selections"
 
 pkg_mgr install build-essential
-pkg_mgr install clang
diff --git a/stemcell_builder/stages/dev_tools_config/assets/generate_dev_tools_file_list.sh b/stemcell_builder/stages/dev_tools_config/assets/generate_dev_tools_file_list.sh
index 9dadedbf85..ead6e46b90 100755
--- a/stemcell_builder/stages/dev_tools_config/assets/generate_dev_tools_file_list.sh
+++ b/stemcell_builder/stages/dev_tools_config/assets/generate_dev_tools_file_list.sh
@@ -24,17 +24,7 @@ PACKAGES=( \
   g++-13 \
   gcc-13 \
   gcc-13-base \
-  gcc-14-base \
-  clang \
-  clang-18 \
-  libclang-common-18-dev \
-  libclang-cpp18 \
-  libclang1-18 \
-  libgc1 \
-  libllvm18 \
-  libobjc-13-dev \
-  libobjc4 \
-  llvm-18-linker-tools \
+  gcc-14-base
 )
 
 for package_name in ${PACKAGES[*]} ; do
diff --git a/stemcell_builder/stages/static_libraries_config/assets/noble_static_libraries_list.txt b/stemcell_builder/stages/static_libraries_config/assets/noble_static_libraries_list.txt
index d1483da2f0..a7185b4774 100644
--- a/stemcell_builder/stages/static_libraries_config/assets/noble_static_libraries_list.txt
+++ b/stemcell_builder/stages/static_libraries_config/assets/noble_static_libraries_list.txt
@@ -20,76 +20,6 @@
 /usr/lib/gcc/x86_64-linux-gnu/13/libtsan.a
 /usr/lib/gcc/x86_64-linux-gnu/13/libubsan.a
 /usr/lib/libsupp.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.asan-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.asan-preinit-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.asan-preinit-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.asan-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.asan_cxx-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.asan_cxx-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.asan_static-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.asan_static-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.builtins-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.builtins-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.cfi-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.cfi-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.cfi_diag-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.cfi_diag-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.dd-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.dfsan-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.fuzzer-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.fuzzer-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.fuzzer_interceptors-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.fuzzer_interceptors-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.fuzzer_no_main-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.fuzzer_no_main-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.gwp_asan-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.gwp_asan-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.hwasan-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.hwasan_aliases-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.hwasan_aliases_cxx-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.hwasan_cxx-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.lsan-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.lsan-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.memprof-preinit-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.memprof-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.memprof_cxx-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.msan-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.msan_cxx-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.orc-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.profile-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.profile-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.safestack-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.safestack-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.scudo-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.scudo-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.scudo_cxx-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.scudo_cxx-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.scudo_cxx_minimal-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.scudo_cxx_minimal-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.scudo_minimal-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.scudo_minimal-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.scudo_standalone-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.scudo_standalone-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.scudo_standalone_cxx-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.scudo_standalone_cxx-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.stats-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.stats-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.stats_client-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.stats_client-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.tsan-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.tsan_cxx-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.ubsan_minimal-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.ubsan_minimal-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.ubsan_standalone-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.ubsan_standalone-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.ubsan_standalone_cxx-i386.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.ubsan_standalone_cxx-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.xray-basic-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.xray-fdr-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.xray-profiling-x86_64.a
-/usr/lib/llvm-18/lib/clang/18.0.0/lib/linux/libclang_rt.xray-x86_64.a
-/usr/lib/llvm-18/lib/libPolly.a
-/usr/lib/llvm-18/lib/libPollyISL.a
 /usr/lib/x86_64-linux-gnu/gprofng/libgp-collectorAPI.a
 /usr/lib/x86_64-linux-gnu/libBrokenLocale.a
 /usr/lib/x86_64-linux-gnu/libanl.a