diff --git a/2.7/alpine3.6/Dockerfile b/2.7/alpine3.6/Dockerfile index 27e4273f1..730804e6e 100644 --- a/2.7/alpine3.6/Dockerfile +++ b/2.7/alpine3.6/Dockerfile @@ -44,10 +44,12 @@ RUN set -ex \ bzip2-dev \ coreutils \ dpkg-dev dpkg \ + expat-dev \ findutils \ gcc \ gdbm-dev \ libc-dev \ + libffi-dev \ libressl \ libressl-dev \ linux-headers \ @@ -69,6 +71,9 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --with-system-expat \ + --with-system-ffi \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/2.7/alpine3.7/Dockerfile b/2.7/alpine3.7/Dockerfile index 0393e06bd..24aaa9d2c 100644 --- a/2.7/alpine3.7/Dockerfile +++ b/2.7/alpine3.7/Dockerfile @@ -43,10 +43,12 @@ RUN set -ex \ bzip2-dev \ coreutils \ dpkg-dev dpkg \ + expat-dev \ findutils \ gcc \ gdbm-dev \ libc-dev \ + libffi-dev \ libnsl-dev \ libressl-dev \ libtirpc-dev \ @@ -69,6 +71,9 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --with-system-expat \ + --with-system-ffi \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/2.7/alpine3.8/Dockerfile b/2.7/alpine3.8/Dockerfile index a3fa6e6e5..8d5b06d6f 100644 --- a/2.7/alpine3.8/Dockerfile +++ b/2.7/alpine3.8/Dockerfile @@ -43,10 +43,12 @@ RUN set -ex \ bzip2-dev \ coreutils \ dpkg-dev dpkg \ + expat-dev \ findutils \ gcc \ gdbm-dev \ libc-dev \ + libffi-dev \ libnsl-dev \ libressl-dev \ libtirpc-dev \ @@ -69,6 +71,9 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --with-system-expat \ + --with-system-ffi \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/2.7/jessie/Dockerfile b/2.7/jessie/Dockerfile index ccade24d0..df67fbeef 100644 --- a/2.7/jessie/Dockerfile +++ b/2.7/jessie/Dockerfile @@ -42,6 +42,7 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/2.7/jessie/slim/Dockerfile b/2.7/jessie/slim/Dockerfile index 46dbc7ee7..febe80ad5 100644 --- a/2.7/jessie/slim/Dockerfile +++ b/2.7/jessie/slim/Dockerfile @@ -63,6 +63,7 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/2.7/stretch/Dockerfile b/2.7/stretch/Dockerfile index 7ffb21d2a..9cf80d87c 100644 --- a/2.7/stretch/Dockerfile +++ b/2.7/stretch/Dockerfile @@ -42,6 +42,7 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/2.7/stretch/slim/Dockerfile b/2.7/stretch/slim/Dockerfile index 5edc5e159..27ae1256d 100644 --- a/2.7/stretch/slim/Dockerfile +++ b/2.7/stretch/slim/Dockerfile @@ -63,6 +63,7 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/2.7/wheezy/Dockerfile b/2.7/wheezy/Dockerfile index 9189538be..9081a51a4 100644 --- a/2.7/wheezy/Dockerfile +++ b/2.7/wheezy/Dockerfile @@ -42,6 +42,7 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.4/alpine3.7/Dockerfile b/3.4/alpine3.7/Dockerfile index 0d20ba0ad..d47726976 100644 --- a/3.4/alpine3.7/Dockerfile +++ b/3.4/alpine3.7/Dockerfile @@ -71,6 +71,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/3.4/alpine3.8/Dockerfile b/3.4/alpine3.8/Dockerfile index 0233bf969..4308dc9a3 100644 --- a/3.4/alpine3.8/Dockerfile +++ b/3.4/alpine3.8/Dockerfile @@ -71,6 +71,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/3.4/jessie/Dockerfile b/3.4/jessie/Dockerfile index a5784289f..2cdfc48fc 100644 --- a/3.4/jessie/Dockerfile +++ b/3.4/jessie/Dockerfile @@ -43,6 +43,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.4/jessie/slim/Dockerfile b/3.4/jessie/slim/Dockerfile index 0554592e0..95f9647b8 100644 --- a/3.4/jessie/slim/Dockerfile +++ b/3.4/jessie/slim/Dockerfile @@ -66,6 +66,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.4/stretch/Dockerfile b/3.4/stretch/Dockerfile index 31f2fea4a..81d01fe6e 100644 --- a/3.4/stretch/Dockerfile +++ b/3.4/stretch/Dockerfile @@ -45,6 +45,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.4/stretch/slim/Dockerfile b/3.4/stretch/slim/Dockerfile index 353034e62..014930345 100644 --- a/3.4/stretch/slim/Dockerfile +++ b/3.4/stretch/slim/Dockerfile @@ -66,6 +66,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.4/wheezy/Dockerfile b/3.4/wheezy/Dockerfile index ca184534e..b787263a7 100644 --- a/3.4/wheezy/Dockerfile +++ b/3.4/wheezy/Dockerfile @@ -43,6 +43,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.5/alpine3.7/Dockerfile b/3.5/alpine3.7/Dockerfile index 3c25f6b17..65e1fe0f5 100644 --- a/3.5/alpine3.7/Dockerfile +++ b/3.5/alpine3.7/Dockerfile @@ -71,6 +71,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/3.5/alpine3.8/Dockerfile b/3.5/alpine3.8/Dockerfile index 1eb7686f1..67ec411af 100644 --- a/3.5/alpine3.8/Dockerfile +++ b/3.5/alpine3.8/Dockerfile @@ -71,6 +71,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/3.5/jessie/Dockerfile b/3.5/jessie/Dockerfile index 4997e28b5..118431bfa 100644 --- a/3.5/jessie/Dockerfile +++ b/3.5/jessie/Dockerfile @@ -43,6 +43,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.5/jessie/slim/Dockerfile b/3.5/jessie/slim/Dockerfile index cc5849b45..e0c37c431 100644 --- a/3.5/jessie/slim/Dockerfile +++ b/3.5/jessie/slim/Dockerfile @@ -66,6 +66,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.5/stretch/Dockerfile b/3.5/stretch/Dockerfile index 31b1d525b..45be9ad21 100644 --- a/3.5/stretch/Dockerfile +++ b/3.5/stretch/Dockerfile @@ -43,6 +43,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.5/stretch/slim/Dockerfile b/3.5/stretch/slim/Dockerfile index 3259bde56..3bb98eef4 100644 --- a/3.5/stretch/slim/Dockerfile +++ b/3.5/stretch/slim/Dockerfile @@ -66,6 +66,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.6/alpine3.6/Dockerfile b/3.6/alpine3.6/Dockerfile index eeff2082c..fcb41cc2f 100644 --- a/3.6/alpine3.6/Dockerfile +++ b/3.6/alpine3.6/Dockerfile @@ -73,6 +73,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/3.6/alpine3.7/Dockerfile b/3.6/alpine3.7/Dockerfile index f3d509fc6..05472e7d5 100644 --- a/3.6/alpine3.7/Dockerfile +++ b/3.6/alpine3.7/Dockerfile @@ -73,6 +73,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/3.6/alpine3.8/Dockerfile b/3.6/alpine3.8/Dockerfile index c3589ccce..f73313cd1 100644 --- a/3.6/alpine3.8/Dockerfile +++ b/3.6/alpine3.8/Dockerfile @@ -73,6 +73,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/3.6/jessie/Dockerfile b/3.6/jessie/Dockerfile index cd9e1ecd1..3dcb881fb 100644 --- a/3.6/jessie/Dockerfile +++ b/3.6/jessie/Dockerfile @@ -43,6 +43,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.6/jessie/slim/Dockerfile b/3.6/jessie/slim/Dockerfile index 3338d8886..faaf97423 100644 --- a/3.6/jessie/slim/Dockerfile +++ b/3.6/jessie/slim/Dockerfile @@ -66,6 +66,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.6/stretch/Dockerfile b/3.6/stretch/Dockerfile index 03704523a..1c48e1e5f 100644 --- a/3.6/stretch/Dockerfile +++ b/3.6/stretch/Dockerfile @@ -43,6 +43,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.6/stretch/slim/Dockerfile b/3.6/stretch/slim/Dockerfile index 836ccb70a..afb58e6ec 100644 --- a/3.6/stretch/slim/Dockerfile +++ b/3.6/stretch/slim/Dockerfile @@ -66,6 +66,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.7/alpine3.7/Dockerfile b/3.7/alpine3.7/Dockerfile index 3ac286c19..9b221cb4b 100644 --- a/3.7/alpine3.7/Dockerfile +++ b/3.7/alpine3.7/Dockerfile @@ -74,6 +74,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/3.7/alpine3.8/Dockerfile b/3.7/alpine3.8/Dockerfile index 0d3bf2837..efed45c86 100644 --- a/3.7/alpine3.8/Dockerfile +++ b/3.7/alpine3.8/Dockerfile @@ -74,6 +74,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/3.7/stretch/Dockerfile b/3.7/stretch/Dockerfile index e8ace9eb8..08c3ca17e 100644 --- a/3.7/stretch/Dockerfile +++ b/3.7/stretch/Dockerfile @@ -44,6 +44,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.7/stretch/slim/Dockerfile b/3.7/stretch/slim/Dockerfile index 074cd6b84..3f2c656bd 100644 --- a/3.7/stretch/slim/Dockerfile +++ b/3.7/stretch/slim/Dockerfile @@ -67,6 +67,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 9f2a84eb6..a2b1f668a 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -70,6 +70,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/Dockerfile-caveman-alpine.template b/Dockerfile-caveman-alpine.template index b4239a104..c8cdb62d7 100644 --- a/Dockerfile-caveman-alpine.template +++ b/Dockerfile-caveman-alpine.template @@ -38,10 +38,12 @@ RUN set -ex \ bzip2-dev \ coreutils \ dpkg-dev dpkg \ + expat-dev \ findutils \ gcc \ gdbm-dev \ libc-dev \ + libffi-dev \ libnsl-dev \ libressl \ libressl-dev \ @@ -65,6 +67,9 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --with-system-expat \ + --with-system-ffi \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/Dockerfile-caveman-debian.template b/Dockerfile-caveman-debian.template index a38778791..e2f6a7c7b 100644 --- a/Dockerfile-caveman-debian.template +++ b/Dockerfile-caveman-debian.template @@ -36,6 +36,7 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/Dockerfile-caveman-slim.template b/Dockerfile-caveman-slim.template index 8a96f06d7..7e69cbed3 100644 --- a/Dockerfile-caveman-slim.template +++ b/Dockerfile-caveman-slim.template @@ -57,6 +57,7 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 8a6db92d3..0d3f51a95 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -40,6 +40,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index a62087e4b..7f55881a2 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -61,6 +61,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \