diff options
-rw-r--r-- | Dockerfile | 35 | ||||
-rw-r--r-- | configure.ac | 12 |
2 files changed, 36 insertions, 11 deletions
diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..95c72d6d --- /dev/null +++ b/Dockerfile @@ -0,0 +1,35 @@ +FROM ubuntu:focal AS build + +ENV DEBIAN_FRONTEND="noninteractive" + +# Build dependencies we can get from apt. +RUN apt-get update && apt-get install -y \ + git libtool autoconf automake g++ gcc make \ + curl clang gnupg gdc openjdk-14-jdk \ + ruby mono-mcs golang ocaml rustc julia + +RUN curl https://www.colm.net/files/thurston.asc | gpg --import - + +WORKDIR /build +ENV COLM_VERSION=0.14.7 +RUN curl -O https://www.colm.net/files/colm/colm-${COLM_VERSION}.tar.gz +RUN curl -O https://www.colm.net/files/colm/colm-${COLM_VERSION}.tar.gz.asc +RUN gpg --verify colm-${COLM_VERSION}.tar.gz.asc colm-${COLM_VERSION}.tar.gz +RUN tar -zxvf colm-${COLM_VERSION}.tar.gz +WORKDIR /build/colm-${COLM_VERSION} +RUN ./configure --prefix=/opt/colm.net/colm --disable-manual +RUN make -j +RUN make install + +WORKDIR /build +ENV RAGEL_VERSION=7.0.4 +RUN curl -O https://www.colm.net/files/ragel/ragel-${RAGEL_VERSION}.tar.gz +RUN curl -O https://www.colm.net/files/ragel/ragel-${RAGEL_VERSION}.tar.gz.asc +RUN gpg --verify ragel-${RAGEL_VERSION}.tar.gz.asc ragel-${RAGEL_VERSION}.tar.gz +RUN tar -zxvf ragel-${RAGEL_VERSION}.tar.gz +WORKDIR /build/ragel-${RAGEL_VERSION} +RUN ./configure --prefix=/opt/colm.net/ragel --with-colm=/opt/colm.net/colm --disable-manual +RUN make -j +RUN make install +WORKDIR /build/ragel-${RAGEL_VERSION}/test +RUN ./runtests diff --git a/configure.ac b/configure.ac index 6b3a5b4b..99269817 100644 --- a/configure.ac +++ b/configure.ac @@ -268,17 +268,7 @@ dnl dnl Installed programs to test in dnl -AC_PATH_PROG([D_BIN], [gdc-8]) -if test "x$D_BIN" = x; then - AC_PATH_PROG([D_BIN], [gdc-7]) - if test "x$D_BIN" = x; then - AC_PATH_PROG([D_BIN], [gdc-6]) - if test "x$D_BIN" = x; then - AC_PATH_PROG([D_BIN], [gdc-5]) - fi - fi -fi - +AC_PATH_PROG([D_BIN], [gdc]) AC_PATH_PROG([JAVAC_BIN], [javac]) dnl |