diff options
| author | David Spickett <david.spickett@linaro.org> | 2024-02-22 10:32:14 +0000 |
|---|---|---|
| committer | David Spickett <david.spickett@linaro.org> | 2024-02-22 10:33:07 +0000 |
| commit | a4e6651f73c9a7765b8fa9a6b47c5a1cb599cb59 (patch) | |
| tree | ca1e9f0a9f14bcc20a9814ae533fe74857ea29ad /tcwg-base | |
| parent | 1c6960b6859224fd6220eb5dd1d9bebb59d75611 (diff) | |
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
Diffstat (limited to 'tcwg-base')
| -rw-r--r-- | tcwg-base/Dockerfile.in | 4 | ||||
| -rw-r--r-- | tcwg-base/tcwg-llvmbot/Dockerfile.in | 2 |
2 files changed, 4 insertions, 2 deletions
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 \ |