From e344cbd0f14c40eeb1e78f59e287052cb717266f Mon Sep 17 00:00:00 2001 From: Neil McPhail Date: Mon, 28 Apr 2025 23:01:27 +0100 Subject: [PATCH] Disable z88dk - presumably this is a musl/glibc thing --- .devcontainer/Dockerfile | 9 +++++---- README.md | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index a80f7eb..f1bdf8e 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM z88dk/z88dk:latest AS z88dk +#FROM z88dk/z88dk:latest AS z88dk FROM ubuntu:24.04 AS build RUN apt-get update \ @@ -41,7 +41,8 @@ COPY --from=build /zxbasic/zxbasm.py /opt/zxbasic/zxbasm COPY --from=build /zxbasic/zxbc.py /opt/zxbasic/zxbc COPY --from=build /zxbasic/zxbpp.py /opt/zxbasic/zxbpp COPY --from=build /zxbasic/src /opt/zxbasic/src -COPY --from=z88dk /opt/z88dk /opt/z88dk +#COPY --from=z88dk /opt/z88dk /opt/z88dk USER ubuntu -RUN echo "PATH=$PATH:/opt/z88dk/bin:/opt/zxbasic" >> ~/.profile -RUN echo "ZCCCFG=/opt/z88dk/lib/config/" >> ~/.profile \ No newline at end of file +#RUN echo "PATH=$PATH:/opt/z88dk/bin:/opt/zxbasic" >> ~/.profile +#RUN echo "export ZCCCFG=/opt/z88dk/lib/config/" >> ~/.profile +RUN echo "PATH=$PATH:/opt/zxbasic" >> ~/.profile \ No newline at end of file diff --git a/README.md b/README.md index aa70952..dd57f58 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ The devcontainer contains: - z80asm (assembler) - z80dasm (disassembler) - zmakebas (creates BASIC programs) -- z88dk (C compiler and other utilities including assembler) +- ~~z88dk (C compiler and other utilities including assembler)~~ - not currently functional - utilities from the FUSE emulator: - audio2tape - createhdf