From a4e6651f73c9a7765b8fa9a6b47c5a1cb599cb59 Mon Sep 17 00:00:00 2001
From: David Spickett <david.spickett@linaro.org>
Date: Thu, 22 Feb 2024 10:32:14 +0000
Subject: tcwg-base: Move libxml2-dev and libedit-dev to base for lldb use

They were already in the llvmbot image, moving them to base
means they'll be in the dev image also.

Change-Id: I93b8353d3403219248f60ea3f22d29192d9ed415
---
 tcwg-base/Dockerfile.in              | 4 ++++
 tcwg-base/tcwg-llvmbot/Dockerfile.in | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'tcwg-base')

diff --git a/tcwg-base/Dockerfile.in b/tcwg-base/Dockerfile.in
index 567a3729..9eafcb1a 100644
--- a/tcwg-base/Dockerfile.in
+++ b/tcwg-base/Dockerfile.in
@@ -65,6 +65,8 @@ RUN apt-get update \
 # libc6-dbg is necessary for armhf debugging, but also helps on aarch64.
  libc6-dbg \
  libcc1-0 \
+# For building lldb.
+ libedit-dev \
  libexpat1-dev \
  libffi-dev \
  libglib2.0-dev \
@@ -86,6 +88,8 @@ RUN apt-get update \
 # focal installs libtinfo6 instead.
  libtinfo5 \
  libtool \
+# For building lldb.
+ libxml2-dev \
  llvm \
  locales \
  lzop \
diff --git a/tcwg-base/tcwg-llvmbot/Dockerfile.in b/tcwg-base/tcwg-llvmbot/Dockerfile.in
index bdf1eb1f..2b5081a1 100644
--- a/tcwg-base/tcwg-llvmbot/Dockerfile.in
+++ b/tcwg-base/tcwg-llvmbot/Dockerfile.in
@@ -17,7 +17,6 @@ RUN apt-get update \
  language-pack-ja \
  language-pack-ru \
  language-pack-zh-hans \
- libedit-dev \
  libjson-perl \
  libtinfo-dev \
 # We build clang+llvm releases on Ubuntu Bionic, which has libtinfo.so.5,
@@ -28,7 +27,6 @@ RUN apt-get update \
 # We should no longer need libtinfo5 when we switch building releases to
 # Ubuntu Focal or later.
  libtinfo5 \
- libxml2-dev \
  linux-tools-common \
  python3-buildbot-worker \
  tmux \
-- 
cgit v1.2.3