diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
| commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
| tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /test/infra/Dockerfile.emba | |
| parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
| parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
| download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz | |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'test/infra/Dockerfile.emba')
| -rw-r--r-- | test/infra/Dockerfile.emba | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/test/infra/Dockerfile.emba b/test/infra/Dockerfile.emba index 421264db9c9..9f03482c3fd 100644 --- a/test/infra/Dockerfile.emba +++ b/test/infra/Dockerfile.emba @@ -28,7 +28,7 @@ FROM debian:stretch as emacs-base RUN apt-get update && \ apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \ - libc-dev gcc g++ make autoconf automake libncurses-dev gnutls-dev git \ + libc-dev gcc g++ make autoconf automake libncurses-dev gnutls-dev git texinfo \ && rm -rf /var/lib/apt/lists/* FROM emacs-base as emacs-inotify @@ -40,21 +40,22 @@ RUN apt-get update && \ COPY . /checkout WORKDIR /checkout RUN ./autogen.sh autoconf -RUN ./configure --without-makeinfo +RUN ./configure RUN make -j4 bootstrap RUN make -j4 FROM emacs-base as emacs-filenotify-gio RUN apt-get update && \ - apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 libglib2.0-dev libglib2.0-bin libglib2.0-0 \ + apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \ + libglib2.0-dev libglib2.0-bin libglib2.0-0 \ && rm -rf /var/lib/apt/lists/* COPY . /checkout WORKDIR /checkout RUN ./autogen.sh autoconf -RUN ./configure --without-makeinfo --with-file-notification=gfile -RUN make bootstrap +RUN ./configure --with-file-notification=gfile +RUN make -j4 bootstrap RUN make -j4 FROM emacs-base as emacs-gnustep @@ -66,6 +67,21 @@ RUN apt-get update && \ COPY . /checkout WORKDIR /checkout RUN ./autogen.sh autoconf -RUN ./configure --without-makeinfo --with-ns +RUN ./configure --with-ns RUN make bootstrap RUN make -j4 + +FROM emacs-base as emacs-native-comp-speed0 + +RUN apt-get update && \ + apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 libgccjit-6-dev \ + && rm -rf /var/lib/apt/lists/* + +ARG make_bootstrap_params="" + +COPY . /checkout +WORKDIR /checkout +RUN ./autogen.sh autoconf +RUN ./configure --with-nativecomp +RUN make bootstrap -j2 NATIVE_FULL_AOT=1 BYTE_COMPILE_EXTRA_FLAGS='--eval "(setq comp-speed 0)"' +RUN make -j4 |