diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2024-03-13 07:43:04 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2024-03-13 11:06:26 +0000 |
| commit | 473e7fba3cf6321dd4c7bbef31cd23b33e08c0e9 (patch) | |
| tree | 3d1832d35cd863fbf476c2157fff1e1c9777a817 /tcwg-base | |
| parent | d5c7cd125d4b81fcd5ba593748a8b4f6edbd5360 (diff) | |
tcwg-base: Fix gnat version
... to GCC's configure test "gcc -c conftest.adb" to pass,
and enable building ada language in tcwg_gnu_native_* CI.
Change-Id: Ief867b9d6bfd000975774dc1ae58e3db4cc74dc8
Diffstat (limited to 'tcwg-base')
| -rw-r--r-- | tcwg-base/Dockerfile.in | 6 | ||||
| -rw-r--r-- | tcwg-base/tcwg-dev/Dockerfile.in | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/tcwg-base/Dockerfile.in b/tcwg-base/Dockerfile.in index ac101f0a..0e4fd071 100644 --- a/tcwg-base/Dockerfile.in +++ b/tcwg-base/Dockerfile.in @@ -54,7 +54,13 @@ RUN apt-get update \ git-filter-repo \ #endif gm2 \ +#if DISTRO_jammy + # For unknown reason "gnat" defaults to "gnat-10" in Jammy, while all other + # GCC packages default to "*-11" versions. + gnat-11 \ +#else gnat \ +#endif gobjc \ gobjc++ \ golang \ diff --git a/tcwg-base/tcwg-dev/Dockerfile.in b/tcwg-base/tcwg-dev/Dockerfile.in index b49f7d72..c17167a8 100644 --- a/tcwg-base/tcwg-dev/Dockerfile.in +++ b/tcwg-base/tcwg-dev/Dockerfile.in @@ -8,7 +8,6 @@ RUN apt-get update \ git-email \ git-gui \ git-svn \ - gnat \ htop \ iputils-ping \ iputils-tracepath \ |