From 04057ac28a72ad4001def05a7bc8e13cc640b5ca Mon Sep 17 00:00:00 2001 From: Max-Gerd Retzlaff Date: Tue, 23 Aug 2022 17:38:34 +0200 Subject: Revert "THRIFT-5501 Remove Common Lisp support" This reverts commit d88d4f93b3390989bd47a43f3941ca7d576750f6. --- build/docker/README.md | 1 + build/docker/old/ubuntu-artful/Dockerfile | 11 +++++++++++ build/docker/ubuntu-bionic/Dockerfile | 12 ++++++++++++ build/docker/ubuntu-disco/Dockerfile | 12 ++++++++++++ 4 files changed, 36 insertions(+) (limited to 'build') diff --git a/build/docker/README.md b/build/docker/README.md index f07faaaef..7ea986f15 100644 --- a/build/docker/README.md +++ b/build/docker/README.md @@ -173,6 +173,7 @@ Last updated: October 1, 2017 | C++ clang | 3.8 | 6.0 | | | C# (mono) | 4.2.1.0 | 4.6.2.7 | | | c_glib | 2.48.2 | 2.56.4 | | +| cl (sbcl) | | 1.5.3 | | | d | 2.087.0 | 2.087.0 | | | dart | 2.0.0 | 2.4.0 | | | delphi | | | Not in CI | diff --git a/build/docker/old/ubuntu-artful/Dockerfile b/build/docker/old/ubuntu-artful/Dockerfile index d1f58d6cc..80682657b 100644 --- a/build/docker/old/ubuntu-artful/Dockerfile +++ b/build/docker/old/ubuntu-artful/Dockerfile @@ -85,6 +85,17 @@ RUN apt-get install -y --no-install-recommends \ qtbase5-dev \ qtbase5-dev-tools +ENV SBCL_VERSION 1.4.5 +RUN \ +`# Common Lisp (sbcl) dependencies` \ + curl --version && \ + curl -O -J -L https://kent.dl.sourceforge.net/project/sbcl/sbcl/${SBCL_VERSION}/sbcl-${SBCL_VERSION}-x86-64-linux-binary.tar.bz2 && \ + tar xjf sbcl-${SBCL_VERSION}-x86-64-linux-binary.tar.bz2 && \ + cd sbcl-${SBCL_VERSION}-x86-64-linux && \ + ./install.sh && \ + sbcl --version && \ + rm -rf sbcl* + ENV D_VERSION 2.080.0 ENV DMD_DEB dmd_2.080.0-0_amd64.deb RUN \ diff --git a/build/docker/ubuntu-bionic/Dockerfile b/build/docker/ubuntu-bionic/Dockerfile index 54b384ea8..aff9df4f0 100644 --- a/build/docker/ubuntu-bionic/Dockerfile +++ b/build/docker/ubuntu-bionic/Dockerfile @@ -87,6 +87,18 @@ RUN apt-get install -y --no-install-recommends \ qtbase5-dev \ qtbase5-dev-tools +ENV SBCL_VERSION 1.5.3 +RUN \ +`# Common Lisp (sbcl) dependencies` \ + curl --version && \ + curl -o sbcl-${SBCL_VERSION}-x86-64-linux-binary.tar.bz2 -J -L https://sourceforge.net/projects/sbcl/files/sbcl/${SBCL_VERSION}/sbcl-${SBCL_VERSION}-x86-64-linux-binary.tar.bz2/download?use_mirror=managedway# && \ + tar xjf sbcl-${SBCL_VERSION}-x86-64-linux-binary.tar.bz2 && \ + cd sbcl-${SBCL_VERSION}-x86-64-linux && \ + ./install.sh && \ + sbcl --version && \ + cd .. && \ + rm -rf sbcl* + ENV D_VERSION 2.087.0 ENV DMD_DEB dmd_2.087.0-0_amd64.deb RUN \ diff --git a/build/docker/ubuntu-disco/Dockerfile b/build/docker/ubuntu-disco/Dockerfile index ee3f19ff4..d530a3559 100644 --- a/build/docker/ubuntu-disco/Dockerfile +++ b/build/docker/ubuntu-disco/Dockerfile @@ -89,6 +89,18 @@ RUN apt-get install -y --no-install-recommends \ qtbase5-dev \ qtbase5-dev-tools +ENV SBCL_VERSION 1.5.3 +RUN \ +`# Common Lisp (sbcl) dependencies` \ + curl --version && \ + curl -o sbcl-${SBCL_VERSION}-x86-64-linux-binary.tar.bz2 -J -L https://sourceforge.net/projects/sbcl/files/sbcl/${SBCL_VERSION}/sbcl-${SBCL_VERSION}-x86-64-linux-binary.tar.bz2/download?use_mirror=managedway# && \ + tar xjf sbcl-${SBCL_VERSION}-x86-64-linux-binary.tar.bz2 && \ + cd sbcl-${SBCL_VERSION}-x86-64-linux && \ + ./install.sh && \ + sbcl --version && \ + cd .. && \ + rm -rf sbcl* + ENV D_VERSION 2.087.0 ENV DMD_DEB dmd_2.087.0-0_amd64.deb RUN \ -- cgit v1.2.1