From 14788c98683cef2ef48fb98977c0807bb07aece5 Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Wed, 5 Jun 2024 15:23:42 -0700 Subject: [PATCH] Add pcre-jit for s390x, remove it on some riscv64 - https://github.com/php/php-src/tree/php-8.1.0/ext/pcre/pcre2lib - https://github.com/PCRE2Project/pcre2/commits/pcre2-10.37/src/sljit/sljitNativeS390X.c - https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib - https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c --- 8.1/alpine3.19/cli/Dockerfile | 7 ++++--- 8.1/alpine3.19/fpm/Dockerfile | 7 ++++--- 8.1/alpine3.19/zts/Dockerfile | 7 ++++--- 8.1/alpine3.20/cli/Dockerfile | 7 ++++--- 8.1/alpine3.20/fpm/Dockerfile | 7 ++++--- 8.1/alpine3.20/zts/Dockerfile | 7 ++++--- 8.1/bookworm/apache/Dockerfile | 7 ++++--- 8.1/bookworm/cli/Dockerfile | 7 ++++--- 8.1/bookworm/fpm/Dockerfile | 7 ++++--- 8.1/bookworm/zts/Dockerfile | 7 ++++--- 8.1/bullseye/apache/Dockerfile | 7 ++++--- 8.1/bullseye/cli/Dockerfile | 7 ++++--- 8.1/bullseye/fpm/Dockerfile | 7 ++++--- 8.1/bullseye/zts/Dockerfile | 7 ++++--- 8.2/alpine3.19/cli/Dockerfile | 7 ++++--- 8.2/alpine3.19/fpm/Dockerfile | 7 ++++--- 8.2/alpine3.19/zts/Dockerfile | 7 ++++--- 8.2/alpine3.20/cli/Dockerfile | 7 ++++--- 8.2/alpine3.20/fpm/Dockerfile | 7 ++++--- 8.2/alpine3.20/zts/Dockerfile | 7 ++++--- 8.2/bookworm/apache/Dockerfile | 7 ++++--- 8.2/bookworm/cli/Dockerfile | 7 ++++--- 8.2/bookworm/fpm/Dockerfile | 7 ++++--- 8.2/bookworm/zts/Dockerfile | 7 ++++--- 8.2/bullseye/apache/Dockerfile | 7 ++++--- 8.2/bullseye/cli/Dockerfile | 7 ++++--- 8.2/bullseye/fpm/Dockerfile | 7 ++++--- 8.2/bullseye/zts/Dockerfile | 7 ++++--- 8.3-rc/alpine3.19/cli/Dockerfile | 3 --- 8.3-rc/alpine3.19/fpm/Dockerfile | 3 --- 8.3-rc/alpine3.19/zts/Dockerfile | 3 --- 8.3-rc/alpine3.20/cli/Dockerfile | 3 --- 8.3-rc/alpine3.20/fpm/Dockerfile | 3 --- 8.3-rc/alpine3.20/zts/Dockerfile | 3 --- 8.3-rc/bookworm/apache/Dockerfile | 3 --- 8.3-rc/bookworm/cli/Dockerfile | 3 --- 8.3-rc/bookworm/fpm/Dockerfile | 3 --- 8.3-rc/bookworm/zts/Dockerfile | 3 --- 8.3-rc/bullseye/apache/Dockerfile | 3 --- 8.3-rc/bullseye/cli/Dockerfile | 3 --- 8.3-rc/bullseye/fpm/Dockerfile | 3 --- 8.3-rc/bullseye/zts/Dockerfile | 3 --- 8.3/alpine3.19/cli/Dockerfile | 3 --- 8.3/alpine3.19/fpm/Dockerfile | 3 --- 8.3/alpine3.19/zts/Dockerfile | 3 --- 8.3/alpine3.20/cli/Dockerfile | 3 --- 8.3/alpine3.20/fpm/Dockerfile | 3 --- 8.3/alpine3.20/zts/Dockerfile | 3 --- 8.3/bookworm/apache/Dockerfile | 3 --- 8.3/bookworm/cli/Dockerfile | 3 --- 8.3/bookworm/fpm/Dockerfile | 3 --- 8.3/bookworm/zts/Dockerfile | 3 --- 8.3/bullseye/apache/Dockerfile | 3 --- 8.3/bullseye/cli/Dockerfile | 3 --- 8.3/bullseye/fpm/Dockerfile | 3 --- 8.3/bullseye/zts/Dockerfile | 3 --- Dockerfile-linux.template | 13 +++++++++---- 57 files changed, 121 insertions(+), 172 deletions(-) diff --git a/8.1/alpine3.19/cli/Dockerfile b/8.1/alpine3.19/cli/Dockerfile index aa70be64f..20475dba2 100644 --- a/8.1/alpine3.19/cli/Dockerfile +++ b/8.1/alpine3.19/cli/Dockerfile @@ -159,9 +159,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-musl' && echo '--without-pcre-jit') \ ; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ diff --git a/8.1/alpine3.19/fpm/Dockerfile b/8.1/alpine3.19/fpm/Dockerfile index acfc16eb5..5a8a0591b 100644 --- a/8.1/alpine3.19/fpm/Dockerfile +++ b/8.1/alpine3.19/fpm/Dockerfile @@ -158,9 +158,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-musl' && echo '--without-pcre-jit') \ \ --disable-cgi \ \ diff --git a/8.1/alpine3.19/zts/Dockerfile b/8.1/alpine3.19/zts/Dockerfile index 53393b5a4..bbf57bcef 100644 --- a/8.1/alpine3.19/zts/Dockerfile +++ b/8.1/alpine3.19/zts/Dockerfile @@ -159,9 +159,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-musl' && echo '--without-pcre-jit') \ \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 --enable-embed \ diff --git a/8.1/alpine3.20/cli/Dockerfile b/8.1/alpine3.20/cli/Dockerfile index fab550c57..e44bf02c5 100644 --- a/8.1/alpine3.20/cli/Dockerfile +++ b/8.1/alpine3.20/cli/Dockerfile @@ -159,9 +159,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-musl' && echo '--without-pcre-jit') \ ; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ diff --git a/8.1/alpine3.20/fpm/Dockerfile b/8.1/alpine3.20/fpm/Dockerfile index dbfc63b28..a8336cae2 100644 --- a/8.1/alpine3.20/fpm/Dockerfile +++ b/8.1/alpine3.20/fpm/Dockerfile @@ -158,9 +158,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-musl' && echo '--without-pcre-jit') \ \ --disable-cgi \ \ diff --git a/8.1/alpine3.20/zts/Dockerfile b/8.1/alpine3.20/zts/Dockerfile index bfd95ba6e..283ee889b 100644 --- a/8.1/alpine3.20/zts/Dockerfile +++ b/8.1/alpine3.20/zts/Dockerfile @@ -159,9 +159,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-musl' && echo '--without-pcre-jit') \ \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 --enable-embed \ diff --git a/8.1/bookworm/apache/Dockerfile b/8.1/bookworm/apache/Dockerfile index c6e7e3521..eec3d3ed5 100644 --- a/8.1/bookworm/apache/Dockerfile +++ b/8.1/bookworm/apache/Dockerfile @@ -230,9 +230,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ --disable-cgi \ diff --git a/8.1/bookworm/cli/Dockerfile b/8.1/bookworm/cli/Dockerfile index 275cb7b46..a7954f01d 100644 --- a/8.1/bookworm/cli/Dockerfile +++ b/8.1/bookworm/cli/Dockerfile @@ -170,9 +170,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 diff --git a/8.1/bookworm/fpm/Dockerfile b/8.1/bookworm/fpm/Dockerfile index b0808d0b8..33e40f5ce 100644 --- a/8.1/bookworm/fpm/Dockerfile +++ b/8.1/bookworm/fpm/Dockerfile @@ -169,9 +169,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ --disable-cgi \ diff --git a/8.1/bookworm/zts/Dockerfile b/8.1/bookworm/zts/Dockerfile index 9e0af8426..f18ac841b 100644 --- a/8.1/bookworm/zts/Dockerfile +++ b/8.1/bookworm/zts/Dockerfile @@ -170,9 +170,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 diff --git a/8.1/bullseye/apache/Dockerfile b/8.1/bullseye/apache/Dockerfile index 58e1de651..27c4fd8a2 100644 --- a/8.1/bullseye/apache/Dockerfile +++ b/8.1/bullseye/apache/Dockerfile @@ -228,9 +228,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ --disable-cgi \ diff --git a/8.1/bullseye/cli/Dockerfile b/8.1/bullseye/cli/Dockerfile index 1ce4a1497..aa0b5699c 100644 --- a/8.1/bullseye/cli/Dockerfile +++ b/8.1/bullseye/cli/Dockerfile @@ -170,9 +170,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 diff --git a/8.1/bullseye/fpm/Dockerfile b/8.1/bullseye/fpm/Dockerfile index 0d0c65dc7..9ff98cd19 100644 --- a/8.1/bullseye/fpm/Dockerfile +++ b/8.1/bullseye/fpm/Dockerfile @@ -169,9 +169,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ --disable-cgi \ diff --git a/8.1/bullseye/zts/Dockerfile b/8.1/bullseye/zts/Dockerfile index b98e1e4e5..8c352cf66 100644 --- a/8.1/bullseye/zts/Dockerfile +++ b/8.1/bullseye/zts/Dockerfile @@ -170,9 +170,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 diff --git a/8.2/alpine3.19/cli/Dockerfile b/8.2/alpine3.19/cli/Dockerfile index eaf25bfbf..9e20312b1 100644 --- a/8.2/alpine3.19/cli/Dockerfile +++ b/8.2/alpine3.19/cli/Dockerfile @@ -157,9 +157,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-musl' && echo '--without-pcre-jit') \ ; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ diff --git a/8.2/alpine3.19/fpm/Dockerfile b/8.2/alpine3.19/fpm/Dockerfile index 01b44b7a9..f29c969dd 100644 --- a/8.2/alpine3.19/fpm/Dockerfile +++ b/8.2/alpine3.19/fpm/Dockerfile @@ -156,9 +156,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-musl' && echo '--without-pcre-jit') \ \ --disable-cgi \ \ diff --git a/8.2/alpine3.19/zts/Dockerfile b/8.2/alpine3.19/zts/Dockerfile index aa2b07026..554fe93b2 100644 --- a/8.2/alpine3.19/zts/Dockerfile +++ b/8.2/alpine3.19/zts/Dockerfile @@ -157,9 +157,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-musl' && echo '--without-pcre-jit') \ \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 --enable-embed \ diff --git a/8.2/alpine3.20/cli/Dockerfile b/8.2/alpine3.20/cli/Dockerfile index 6b2fedceb..b75c4dab4 100644 --- a/8.2/alpine3.20/cli/Dockerfile +++ b/8.2/alpine3.20/cli/Dockerfile @@ -157,9 +157,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-musl' && echo '--without-pcre-jit') \ ; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ diff --git a/8.2/alpine3.20/fpm/Dockerfile b/8.2/alpine3.20/fpm/Dockerfile index cbb29815b..96e39207d 100644 --- a/8.2/alpine3.20/fpm/Dockerfile +++ b/8.2/alpine3.20/fpm/Dockerfile @@ -156,9 +156,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-musl' && echo '--without-pcre-jit') \ \ --disable-cgi \ \ diff --git a/8.2/alpine3.20/zts/Dockerfile b/8.2/alpine3.20/zts/Dockerfile index dd9ba32a5..ca833b77d 100644 --- a/8.2/alpine3.20/zts/Dockerfile +++ b/8.2/alpine3.20/zts/Dockerfile @@ -157,9 +157,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-musl' && echo '--without-pcre-jit') \ \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 --enable-embed \ diff --git a/8.2/bookworm/apache/Dockerfile b/8.2/bookworm/apache/Dockerfile index 796d29346..892e9276b 100644 --- a/8.2/bookworm/apache/Dockerfile +++ b/8.2/bookworm/apache/Dockerfile @@ -228,9 +228,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ --disable-cgi \ diff --git a/8.2/bookworm/cli/Dockerfile b/8.2/bookworm/cli/Dockerfile index 278357dd0..396361bb4 100644 --- a/8.2/bookworm/cli/Dockerfile +++ b/8.2/bookworm/cli/Dockerfile @@ -168,9 +168,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 diff --git a/8.2/bookworm/fpm/Dockerfile b/8.2/bookworm/fpm/Dockerfile index c39128914..918186f19 100644 --- a/8.2/bookworm/fpm/Dockerfile +++ b/8.2/bookworm/fpm/Dockerfile @@ -167,9 +167,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ --disable-cgi \ diff --git a/8.2/bookworm/zts/Dockerfile b/8.2/bookworm/zts/Dockerfile index abafd6be7..3521ae2a4 100644 --- a/8.2/bookworm/zts/Dockerfile +++ b/8.2/bookworm/zts/Dockerfile @@ -168,9 +168,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 diff --git a/8.2/bullseye/apache/Dockerfile b/8.2/bullseye/apache/Dockerfile index 058eb6c2d..367d447a3 100644 --- a/8.2/bullseye/apache/Dockerfile +++ b/8.2/bullseye/apache/Dockerfile @@ -226,9 +226,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ --disable-cgi \ diff --git a/8.2/bullseye/cli/Dockerfile b/8.2/bullseye/cli/Dockerfile index 6159d8ace..e1b8f1e8c 100644 --- a/8.2/bullseye/cli/Dockerfile +++ b/8.2/bullseye/cli/Dockerfile @@ -168,9 +168,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 diff --git a/8.2/bullseye/fpm/Dockerfile b/8.2/bullseye/fpm/Dockerfile index 5850c7ca7..c1411a4ef 100644 --- a/8.2/bullseye/fpm/Dockerfile +++ b/8.2/bullseye/fpm/Dockerfile @@ -167,9 +167,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ --disable-cgi \ diff --git a/8.2/bullseye/zts/Dockerfile b/8.2/bullseye/zts/Dockerfile index 0b4e551c6..c98af44ef 100644 --- a/8.2/bullseye/zts/Dockerfile +++ b/8.2/bullseye/zts/Dockerfile @@ -168,9 +168,10 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib + $(test "$gnuArch" = 'riscv64-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 diff --git a/8.3-rc/alpine3.19/cli/Dockerfile b/8.3-rc/alpine3.19/cli/Dockerfile index 1fd258ae1..42f14a55d 100644 --- a/8.3-rc/alpine3.19/cli/Dockerfile +++ b/8.3-rc/alpine3.19/cli/Dockerfile @@ -157,9 +157,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ ; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ diff --git a/8.3-rc/alpine3.19/fpm/Dockerfile b/8.3-rc/alpine3.19/fpm/Dockerfile index 4baa03136..08d0afcd4 100644 --- a/8.3-rc/alpine3.19/fpm/Dockerfile +++ b/8.3-rc/alpine3.19/fpm/Dockerfile @@ -156,9 +156,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ \ --disable-cgi \ \ diff --git a/8.3-rc/alpine3.19/zts/Dockerfile b/8.3-rc/alpine3.19/zts/Dockerfile index 302a3a3e2..c659f8f96 100644 --- a/8.3-rc/alpine3.19/zts/Dockerfile +++ b/8.3-rc/alpine3.19/zts/Dockerfile @@ -157,9 +157,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 --enable-embed \ diff --git a/8.3-rc/alpine3.20/cli/Dockerfile b/8.3-rc/alpine3.20/cli/Dockerfile index 8b776ac18..b4790c7a8 100644 --- a/8.3-rc/alpine3.20/cli/Dockerfile +++ b/8.3-rc/alpine3.20/cli/Dockerfile @@ -157,9 +157,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ ; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ diff --git a/8.3-rc/alpine3.20/fpm/Dockerfile b/8.3-rc/alpine3.20/fpm/Dockerfile index 1892e93a2..44200068e 100644 --- a/8.3-rc/alpine3.20/fpm/Dockerfile +++ b/8.3-rc/alpine3.20/fpm/Dockerfile @@ -156,9 +156,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ \ --disable-cgi \ \ diff --git a/8.3-rc/alpine3.20/zts/Dockerfile b/8.3-rc/alpine3.20/zts/Dockerfile index ff3c29960..5d0ecdc7a 100644 --- a/8.3-rc/alpine3.20/zts/Dockerfile +++ b/8.3-rc/alpine3.20/zts/Dockerfile @@ -157,9 +157,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 --enable-embed \ diff --git a/8.3-rc/bookworm/apache/Dockerfile b/8.3-rc/bookworm/apache/Dockerfile index 5c7589372..13ddd1db3 100644 --- a/8.3-rc/bookworm/apache/Dockerfile +++ b/8.3-rc/bookworm/apache/Dockerfile @@ -228,9 +228,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ --disable-cgi \ diff --git a/8.3-rc/bookworm/cli/Dockerfile b/8.3-rc/bookworm/cli/Dockerfile index fa302fcee..8bcafae0b 100644 --- a/8.3-rc/bookworm/cli/Dockerfile +++ b/8.3-rc/bookworm/cli/Dockerfile @@ -168,9 +168,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 diff --git a/8.3-rc/bookworm/fpm/Dockerfile b/8.3-rc/bookworm/fpm/Dockerfile index 47401d78b..0de3a057f 100644 --- a/8.3-rc/bookworm/fpm/Dockerfile +++ b/8.3-rc/bookworm/fpm/Dockerfile @@ -167,9 +167,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ --disable-cgi \ diff --git a/8.3-rc/bookworm/zts/Dockerfile b/8.3-rc/bookworm/zts/Dockerfile index 8a28fdb33..90da7f56b 100644 --- a/8.3-rc/bookworm/zts/Dockerfile +++ b/8.3-rc/bookworm/zts/Dockerfile @@ -168,9 +168,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 diff --git a/8.3-rc/bullseye/apache/Dockerfile b/8.3-rc/bullseye/apache/Dockerfile index cd87baec2..ca2d15269 100644 --- a/8.3-rc/bullseye/apache/Dockerfile +++ b/8.3-rc/bullseye/apache/Dockerfile @@ -226,9 +226,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ --disable-cgi \ diff --git a/8.3-rc/bullseye/cli/Dockerfile b/8.3-rc/bullseye/cli/Dockerfile index eb6893a3d..4a56b4176 100644 --- a/8.3-rc/bullseye/cli/Dockerfile +++ b/8.3-rc/bullseye/cli/Dockerfile @@ -168,9 +168,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 diff --git a/8.3-rc/bullseye/fpm/Dockerfile b/8.3-rc/bullseye/fpm/Dockerfile index 32f849a20..a8a5878c4 100644 --- a/8.3-rc/bullseye/fpm/Dockerfile +++ b/8.3-rc/bullseye/fpm/Dockerfile @@ -167,9 +167,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ --disable-cgi \ diff --git a/8.3-rc/bullseye/zts/Dockerfile b/8.3-rc/bullseye/zts/Dockerfile index 0e8f60a9c..10c4fcae7 100644 --- a/8.3-rc/bullseye/zts/Dockerfile +++ b/8.3-rc/bullseye/zts/Dockerfile @@ -168,9 +168,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 diff --git a/8.3/alpine3.19/cli/Dockerfile b/8.3/alpine3.19/cli/Dockerfile index 9c124a09c..9b9624c53 100644 --- a/8.3/alpine3.19/cli/Dockerfile +++ b/8.3/alpine3.19/cli/Dockerfile @@ -157,9 +157,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ ; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ diff --git a/8.3/alpine3.19/fpm/Dockerfile b/8.3/alpine3.19/fpm/Dockerfile index d358f3c9b..74f3c267d 100644 --- a/8.3/alpine3.19/fpm/Dockerfile +++ b/8.3/alpine3.19/fpm/Dockerfile @@ -156,9 +156,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ \ --disable-cgi \ \ diff --git a/8.3/alpine3.19/zts/Dockerfile b/8.3/alpine3.19/zts/Dockerfile index 6d8b91901..979f010fe 100644 --- a/8.3/alpine3.19/zts/Dockerfile +++ b/8.3/alpine3.19/zts/Dockerfile @@ -157,9 +157,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 --enable-embed \ diff --git a/8.3/alpine3.20/cli/Dockerfile b/8.3/alpine3.20/cli/Dockerfile index e1283f90b..f1f261535 100644 --- a/8.3/alpine3.20/cli/Dockerfile +++ b/8.3/alpine3.20/cli/Dockerfile @@ -157,9 +157,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ ; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ diff --git a/8.3/alpine3.20/fpm/Dockerfile b/8.3/alpine3.20/fpm/Dockerfile index 12be80f2a..1e17145d8 100644 --- a/8.3/alpine3.20/fpm/Dockerfile +++ b/8.3/alpine3.20/fpm/Dockerfile @@ -156,9 +156,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ \ --disable-cgi \ \ diff --git a/8.3/alpine3.20/zts/Dockerfile b/8.3/alpine3.20/zts/Dockerfile index 4c918f77f..54366d38e 100644 --- a/8.3/alpine3.20/zts/Dockerfile +++ b/8.3/alpine3.20/zts/Dockerfile @@ -157,9 +157,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 --enable-embed \ diff --git a/8.3/bookworm/apache/Dockerfile b/8.3/bookworm/apache/Dockerfile index ceec51eca..096303857 100644 --- a/8.3/bookworm/apache/Dockerfile +++ b/8.3/bookworm/apache/Dockerfile @@ -228,9 +228,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ --disable-cgi \ diff --git a/8.3/bookworm/cli/Dockerfile b/8.3/bookworm/cli/Dockerfile index 115626dc8..d24d44db1 100644 --- a/8.3/bookworm/cli/Dockerfile +++ b/8.3/bookworm/cli/Dockerfile @@ -168,9 +168,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 diff --git a/8.3/bookworm/fpm/Dockerfile b/8.3/bookworm/fpm/Dockerfile index a30dbf6a3..e47c6ed9e 100644 --- a/8.3/bookworm/fpm/Dockerfile +++ b/8.3/bookworm/fpm/Dockerfile @@ -167,9 +167,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ --disable-cgi \ diff --git a/8.3/bookworm/zts/Dockerfile b/8.3/bookworm/zts/Dockerfile index 19e5bc53e..cc65c247e 100644 --- a/8.3/bookworm/zts/Dockerfile +++ b/8.3/bookworm/zts/Dockerfile @@ -168,9 +168,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 diff --git a/8.3/bullseye/apache/Dockerfile b/8.3/bullseye/apache/Dockerfile index 92b38ae3f..41928c125 100644 --- a/8.3/bullseye/apache/Dockerfile +++ b/8.3/bullseye/apache/Dockerfile @@ -226,9 +226,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ --disable-cgi \ diff --git a/8.3/bullseye/cli/Dockerfile b/8.3/bullseye/cli/Dockerfile index 2231c9cda..769cfa1c4 100644 --- a/8.3/bullseye/cli/Dockerfile +++ b/8.3/bullseye/cli/Dockerfile @@ -168,9 +168,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 diff --git a/8.3/bullseye/fpm/Dockerfile b/8.3/bullseye/fpm/Dockerfile index 1ac9c8648..f47e936d3 100644 --- a/8.3/bullseye/fpm/Dockerfile +++ b/8.3/bullseye/fpm/Dockerfile @@ -167,9 +167,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ --disable-cgi \ diff --git a/8.3/bullseye/zts/Dockerfile b/8.3/bullseye/zts/Dockerfile index a708fd232..9c14a76d2 100644 --- a/8.3/bullseye/zts/Dockerfile +++ b/8.3/bullseye/zts/Dockerfile @@ -168,9 +168,6 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ --with-libdir="lib/$debMultiarch" \ \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index b78e20298..e215d694b 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -352,12 +352,17 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT +{{ if [ "8.1", "8.2" ] | index(env.version | rtrimstr("-rc")) then ( -}} +# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) +# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c +# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib {{ if is_alpine then ( -}} - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ + $(test "$gnuArch" = 'riscv64-linux-musl' && echo '--without-pcre-jit') \ {{ ) else ( -}} - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ + $(test "$gnuArch" = 'riscv64-linux-gnu' && echo '--without-pcre-jit') \ +{{ ) end -}} +{{ ) else "" end -}} +{{ if is_alpine then "" else ( -}} --with-libdir="lib/$debMultiarch" \ {{ ) end -}} {{ # https://github.com/docker-library/php/issues/280 -}}