Martin Roth has uploaded this change for review. ( https://review.coreboot.org/28544
Change subject: util/docker: work-around toolchain build issues ......................................................................
util/docker: work-around toolchain build issues
When trying to update the builders to the newest version of the toolchain, I ran into a couple of problems. This patch attempts to work around the issues, but doesn't seem to be a good solution to either.
- GCC 8.1 fails to build with the current libisl-dev package (.20-2) in debian sid. - The patches added to make require that we use automake & aclocal to rebuild the configuration, but version 1.15 of autotools is expected. After debian sid updated to autotools 1.16, the tools can't be located.
Change-Id: I9f616b96e728106e7adf321325caa06808e064c2 Signed-off-by: Martin Roth martinr@coreboot.org --- M util/docker/coreboot-sdk/Dockerfile 1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/28544/1
diff --git a/util/docker/coreboot-sdk/Dockerfile b/util/docker/coreboot-sdk/Dockerfile index 412362f..038de83 100644 --- a/util/docker/coreboot-sdk/Dockerfile +++ b/util/docker/coreboot-sdk/Dockerfile @@ -42,7 +42,7 @@ libftdi1-dev \ libglib2.0-dev \ libgmp-dev \ - libisl-dev \ + libisl-0.18-dev \ libjaylink-dev \ liblzma-dev \ libncurses5-dev \ @@ -71,7 +71,9 @@ wget \ xz-utils \ zlib1g-dev \ - && apt-get clean + && apt-get clean \ + && ln -s /usr/bin/automake /usr/bin/automake-1.15 \ + && ln -s /usr/bin/aclocal /usr/bin/aclocal-1.15
RUN \ cd /root && \