From bfd1e0b241ce8e5fb5f0a23806f76a410dd7c319 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Wed, 25 Jun 2025 08:35:41 +0300 Subject: [PATCH] Switch to new compile-r7rs --- dockerfiles/Dockerfile.snow-chibi-install-test | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/dockerfiles/Dockerfile.snow-chibi-install-test b/dockerfiles/Dockerfile.snow-chibi-install-test index b48576b..91394ec 100644 --- a/dockerfiles/Dockerfile.snow-chibi-install-test +++ b/dockerfiles/Dockerfile.snow-chibi-install-test @@ -1,11 +1,4 @@ ARG COMPILE_R7RS=chibi -FROM schemers/sagittarius AS build -RUN apt-get update && apt-get install -y wget build-essential make cmake libgc-dev zlib1g-dev libffi-dev libssl-dev git -RUN git clone https://github.com/Retropikzel/chibi-scheme.git --branch=snow-chibi-foreign-depends -RUN cd chibi-scheme && make PREFIX=/usr/local-other && make PREFIX=/usr/local-other install -RUN wget https://github.com/ktakashi/sagittarius-scheme/releases/download/v0.9.13/sagittarius-0.9.13.tar.gz && tar -xf sagittarius-0.9.13.tar.gz -RUN cd sagittarius-0.9.13 && ./dist.sh gen && cmake -DCMAKE_INSTALL_PREFIX=/usr/local-other && make && make install - FROM schemers/${COMPILE_R7RS} RUN apt-get update && apt-get install -y \ build-essential \ @@ -19,10 +12,9 @@ RUN apt-get update && apt-get install -y \ libffi-dev \ libmbedtls-dev \ markdown -COPY --from=build /usr/local-other /usr/local-other -RUN ln -sf /usr/local/bin/chibi-scheme /usr/local/bin/chibi -RUN rm -rf /usr/local/bin/snow-chibi -ENV PATH=${PATH}:/usr/local-other/bin +RUN git clone https://github.com/Retropikzel/chibi-scheme.git --branch=snow-chibi-foreign-depends +RUN cd chibi-scheme && make && make install +RUN chicken-install r7rs RUN git clone https://gitea.scheme.org/Retropikzel/compile-r7rs.git --depth=1 RUN cd compile-r7rs && make && make install