From 38ead37b9c60df86dffe3cf06371ad99f249fa3d Mon Sep 17 00:00:00 2001 From: Michal Kuratczyk Date: Mon, 21 Jun 2021 15:16:16 +0200 Subject: [PATCH 1/2] Enable JIT, install g++ Erlang 24 provide JIT support that requires c++17-compatible compiler. Without the g++ package, `autoconf` considers this support missing and therefore silently disables JIT. This commits makes sure that: 1. g++ is installed (this makes `autoconf` detect it correctly as c++17-compatible) 2. Explicitly enables JIT so that it fails in case something changes in the future. JIT is a great feature so we don't want it being silently turned off for any reason. Co-authored-by: Michal Kuratczyk --- 3.8-rc/alpine/Dockerfile | 2 ++ 3.8-rc/ubuntu/Dockerfile | 2 ++ 3.8/alpine/Dockerfile | 2 ++ 3.8/ubuntu/Dockerfile | 2 ++ Dockerfile-alpine.template | 2 ++ Dockerfile-ubuntu.template | 2 ++ 6 files changed, 12 insertions(+) diff --git a/3.8-rc/alpine/Dockerfile b/3.8-rc/alpine/Dockerfile index ee256f59..07c0e4a1 100644 --- a/3.8-rc/alpine/Dockerfile +++ b/3.8-rc/alpine/Dockerfile @@ -43,6 +43,7 @@ RUN set -eux; \ autoconf \ dpkg-dev dpkg \ gcc \ + g++ \ gnupg \ libc-dev \ linux-headers \ @@ -122,6 +123,7 @@ RUN set -eux; \ --disable-hipe \ --disable-sctp \ --disable-silent-rules \ + --enable-jit --enable-clock-gettime \ --enable-hybrid-heap \ --enable-kernel-poll \ diff --git a/3.8-rc/ubuntu/Dockerfile b/3.8-rc/ubuntu/Dockerfile index ac81ade9..e1357adf 100644 --- a/3.8-rc/ubuntu/Dockerfile +++ b/3.8-rc/ubuntu/Dockerfile @@ -49,6 +49,7 @@ RUN set -eux; \ ca-certificates \ dpkg-dev \ gcc \ + g++ \ gnupg \ libncurses5-dev \ make \ @@ -129,6 +130,7 @@ RUN set -eux; \ --disable-hipe \ --disable-sctp \ --disable-silent-rules \ + --enable-jit \ --enable-clock-gettime \ --enable-hybrid-heap \ --enable-kernel-poll \ diff --git a/3.8/alpine/Dockerfile b/3.8/alpine/Dockerfile index 3f7e1c0b..7d500e0a 100644 --- a/3.8/alpine/Dockerfile +++ b/3.8/alpine/Dockerfile @@ -43,6 +43,7 @@ RUN set -eux; \ autoconf \ dpkg-dev dpkg \ gcc \ + g++ \ gnupg \ libc-dev \ linux-headers \ @@ -122,6 +123,7 @@ RUN set -eux; \ --disable-hipe \ --disable-sctp \ --disable-silent-rules \ + --enable-jit --enable-clock-gettime \ --enable-hybrid-heap \ --enable-kernel-poll \ diff --git a/3.8/ubuntu/Dockerfile b/3.8/ubuntu/Dockerfile index f3ebd999..3f9adc22 100644 --- a/3.8/ubuntu/Dockerfile +++ b/3.8/ubuntu/Dockerfile @@ -49,6 +49,7 @@ RUN set -eux; \ ca-certificates \ dpkg-dev \ gcc \ + g++ \ gnupg \ libncurses5-dev \ make \ @@ -129,6 +130,7 @@ RUN set -eux; \ --disable-hipe \ --disable-sctp \ --disable-silent-rules \ + --enable-jit \ --enable-clock-gettime \ --enable-hybrid-heap \ --enable-kernel-poll \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 7dad0715..c8517596 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -59,6 +59,7 @@ RUN set -eux; \ autoconf \ dpkg-dev dpkg \ gcc \ + g++ \ gnupg \ libc-dev \ linux-headers \ @@ -138,6 +139,7 @@ RUN set -eux; \ --disable-hipe \ --disable-sctp \ --disable-silent-rules \ + --enable-jit --enable-clock-gettime \ --enable-hybrid-heap \ --enable-kernel-poll \ diff --git a/Dockerfile-ubuntu.template b/Dockerfile-ubuntu.template index ef8dc9ea..1c172094 100644 --- a/Dockerfile-ubuntu.template +++ b/Dockerfile-ubuntu.template @@ -65,6 +65,7 @@ RUN set -eux; \ ca-certificates \ dpkg-dev \ gcc \ + g++ \ gnupg \ libncurses5-dev \ make \ @@ -145,6 +146,7 @@ RUN set -eux; \ --disable-hipe \ --disable-sctp \ --disable-silent-rules \ + --enable-jit \ --enable-clock-gettime \ --enable-hybrid-heap \ --enable-kernel-poll \ From 973c614dca0ab87e0db768b6c76e9fd9bc323bf7 Mon Sep 17 00:00:00 2001 From: Michal Kuratczyk Date: Mon, 21 Jun 2021 15:56:35 +0200 Subject: [PATCH 2/2] Add missing `\` --- 3.8-rc/alpine/Dockerfile | 2 +- 3.8/alpine/Dockerfile | 2 +- Dockerfile-alpine.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/3.8-rc/alpine/Dockerfile b/3.8-rc/alpine/Dockerfile index 07c0e4a1..bb9b888a 100644 --- a/3.8-rc/alpine/Dockerfile +++ b/3.8-rc/alpine/Dockerfile @@ -123,7 +123,7 @@ RUN set -eux; \ --disable-hipe \ --disable-sctp \ --disable-silent-rules \ - --enable-jit + --enable-jit \ --enable-clock-gettime \ --enable-hybrid-heap \ --enable-kernel-poll \ diff --git a/3.8/alpine/Dockerfile b/3.8/alpine/Dockerfile index 7d500e0a..ee974af9 100644 --- a/3.8/alpine/Dockerfile +++ b/3.8/alpine/Dockerfile @@ -123,7 +123,7 @@ RUN set -eux; \ --disable-hipe \ --disable-sctp \ --disable-silent-rules \ - --enable-jit + --enable-jit \ --enable-clock-gettime \ --enable-hybrid-heap \ --enable-kernel-poll \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index c8517596..086787fe 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -139,7 +139,7 @@ RUN set -eux; \ --disable-hipe \ --disable-sctp \ --disable-silent-rules \ - --enable-jit + --enable-jit \ --enable-clock-gettime \ --enable-hybrid-heap \ --enable-kernel-poll \