From a0fe8e4355dfcf410a61c9308c72ed8397620e71 Mon Sep 17 00:00:00 2001 From: Joel Martin Date: Mon, 5 Aug 2024 10:06:45 -0500 Subject: [PATCH] c.2,make,perl6,ocaml,objpascal: update to ubuntu:24.04 c.2: By updating to 24.04 we get around an error with declarations after labels which is allowed in more recent compiler versions. make: With older make, the newer make code results in this error: ../make/readline.mk:13: *** unterminated call to function 'eval': missing ')'. Stop. Newer versions of make work fine. perl6: With older rakudo, this error occurs: user> (let* (DEBUG-EVAL false) (- 3 1)) Cannot resolve caller Numeric(types::MalFalse: ); none of these signatures match: ocaml: Fixes build error that happens with older versions of ocaml: ocamlopt -a types.ml reader.ml printer.ml env.ml core.ml -o mal_lib.cmxa File "env.ml", line 15, characters 8-21: Error: Unbound value Data.find_opt objpascal: With older compiler, the following error occurs: user> (apply str (seq "this is a test")) *** Error in `../objpascal/stepA_mal': corrupted size vs. prev_size: 0x000000000246c360 *** --- impls/c.2/Dockerfile | 8 +++----- impls/make/Dockerfile | 5 +++-- impls/objpascal/Dockerfile | 5 +++-- impls/ocaml/Dockerfile | 5 +++-- impls/perl6/Dockerfile | 19 ++++--------------- 5 files changed, 16 insertions(+), 26 deletions(-) diff --git a/impls/c.2/Dockerfile b/impls/c.2/Dockerfile index 79bab2ecad..2795e538d2 100644 --- a/impls/c.2/Dockerfile +++ b/impls/c.2/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:bionic +FROM ubuntu:24.04 MAINTAINER Duncan Watts ########################################################## @@ -9,10 +9,8 @@ MAINTAINER Duncan Watts RUN apt-get -y update # Required for running tests -RUN apt-get -y install make python - -# Some typical implementation and test requirements -#RUN apt-get -y install curl +RUN apt-get -y install make python3 +RUN ln -fs /usr/bin/python3 /usr/local/bin/python RUN mkdir -p /mal WORKDIR /mal diff --git a/impls/make/Dockerfile b/impls/make/Dockerfile index 457f951968..0890fa83de 100644 --- a/impls/make/Dockerfile +++ b/impls/make/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:xenial +FROM ubuntu:24.04 MAINTAINER Joel Martin ########################################################## @@ -9,7 +9,8 @@ MAINTAINER Joel Martin RUN apt-get -y update # Required for running tests -RUN apt-get -y install make python +RUN apt-get -y install make python3 +RUN ln -fs /usr/bin/python3 /usr/local/bin/python # Some typical implementation and test requirements RUN apt-get -y install curl libreadline-dev libedit-dev diff --git a/impls/objpascal/Dockerfile b/impls/objpascal/Dockerfile index 7173442f3d..743ec8bbea 100644 --- a/impls/objpascal/Dockerfile +++ b/impls/objpascal/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:xenial +FROM ubuntu:24.04 MAINTAINER Joel Martin ########################################################## @@ -9,7 +9,8 @@ MAINTAINER Joel Martin RUN apt-get -y update # Required for running tests -RUN apt-get -y install make python +RUN apt-get -y install make python3 +RUN ln -fs /usr/bin/python3 /usr/local/bin/python # Some typical implementation and test requirements RUN apt-get -y install curl libreadline-dev libedit-dev diff --git a/impls/ocaml/Dockerfile b/impls/ocaml/Dockerfile index 2d8a83da24..4f7392ab3b 100644 --- a/impls/ocaml/Dockerfile +++ b/impls/ocaml/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:xenial +FROM ubuntu:24.04 MAINTAINER Joel Martin ########################################################## @@ -9,7 +9,8 @@ MAINTAINER Joel Martin RUN apt-get -y update # Required for running tests -RUN apt-get -y install make python +RUN apt-get -y install make python3 +RUN ln -fs /usr/bin/python3 /usr/local/bin/python # Some typical implementation and test requirements RUN apt-get -y install curl libreadline-dev libedit-dev diff --git a/impls/perl6/Dockerfile b/impls/perl6/Dockerfile index ea081e882a..d77ab0de62 100644 --- a/impls/perl6/Dockerfile +++ b/impls/perl6/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:vivid +FROM ubuntu:24.04 MAINTAINER Joel Martin ########################################################## @@ -9,10 +9,8 @@ MAINTAINER Joel Martin RUN apt-get -y update # Required for running tests -RUN apt-get -y install make python - -# Some typical implementation and test requirements -RUN apt-get -y install curl libreadline-dev libedit-dev +RUN apt-get -y install make python3 +RUN ln -fs /usr/bin/python3 /usr/local/bin/python RUN mkdir -p /mal WORKDIR /mal @@ -22,13 +20,4 @@ WORKDIR /mal ########################################################## # Perl6 build deps -RUN apt-get -y install libfile-copy-recursive-perl build-essential git - -RUN curl -O http://rakudo.org/downloads/star/rakudo-star-2016.07.tar.gz && \ - tar xzf rakudo-star-2016.07.tar.gz && \ - cd rakudo-star-2016.07 && \ - perl Configure.pl --prefix=/usr --gen-moar --gen-nqp --backends=moar && \ - make && \ - make install && \ - cd .. && \ - rm -rf rakudo-star-2016.07* +RUN apt-get -y install rakudo