Skip to content

Use bundled pcre and disable pcre-jit on unsupported platforms #526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yosifkit merged 2 commits into from
Nov 29, 2017
Merged

Use bundled pcre and disable pcre-jit on unsupported platforms #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
223086c
Use bundled pcre to be closer to upstream and disable pcre-jit on uns…
yosifkit Nov 29, 2017
25e8a92
Apply pcre-jit change to all versions
yosifkit Nov 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions 5.6/alpine3.4/cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ ENV PHPIZE_DEPS \
gcc \
libc-dev \
make \
pcre-dev \
pkgconf \
re2c
RUN apk add --no-cache --virtual .persistent-deps \
Expand Down Expand Up @@ -124,9 +123,9 @@ RUN set -xe \
--with-openssl \
--with-zlib \
\
# bundled pcre is too old for s390x (which isn't exactly a good sign)
# /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
--with-pcre-regex=/usr \
# bundled pcre does not support JIT on s390x
# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
\
$PHP_EXTRA_CONFIGURE_ARGS \
&& make -j "$(nproc)" \
Expand Down
7 changes: 3 additions & 4 deletions 5.6/alpine3.4/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ ENV PHPIZE_DEPS \
gcc \
libc-dev \
make \
pcre-dev \
pkgconf \
re2c
RUN apk add --no-cache --virtual .persistent-deps \
Expand Down Expand Up @@ -125,9 +124,9 @@ RUN set -xe \
--with-openssl \
--with-zlib \
\
# bundled pcre is too old for s390x (which isn't exactly a good sign)
# /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
--with-pcre-regex=/usr \
# bundled pcre does not support JIT on s390x
# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
\
$PHP_EXTRA_CONFIGURE_ARGS \
&& make -j "$(nproc)" \
Expand Down
7 changes: 3 additions & 4 deletions 5.6/alpine3.4/zts/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ ENV PHPIZE_DEPS \
gcc \
libc-dev \
make \
pcre-dev \
pkgconf \
re2c
RUN apk add --no-cache --virtual .persistent-deps \
Expand Down Expand Up @@ -125,9 +124,9 @@ RUN set -xe \
--with-openssl \
--with-zlib \
\
# bundled pcre is too old for s390x (which isn't exactly a good sign)
# /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
--with-pcre-regex=/usr \
# bundled pcre does not support JIT on s390x
# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
\
$PHP_EXTRA_CONFIGURE_ARGS \
&& make -j "$(nproc)" \
Expand Down
7 changes: 3 additions & 4 deletions 5.6/jessie/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ ENV PHPIZE_DEPS \
g++ \
gcc \
libc-dev \
libpcre3-dev \
make \
pkg-config \
re2c
Expand Down Expand Up @@ -192,9 +191,9 @@ RUN set -xe \
--with-openssl \
--with-zlib \
\
# bundled pcre is too old for s390x (which isn't exactly a good sign)
# /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
--with-pcre-regex=/usr \
# bundled pcre does not support JIT on s390x
# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
--with-libdir="lib/$debMultiarch" \
\
$PHP_EXTRA_CONFIGURE_ARGS \
Expand Down
7 changes: 3 additions & 4 deletions 5.6/jessie/cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ ENV PHPIZE_DEPS \
g++ \
gcc \
libc-dev \
libpcre3-dev \
make \
pkg-config \
re2c
Expand Down Expand Up @@ -133,9 +132,9 @@ RUN set -xe \
--with-openssl \
--with-zlib \
\
# bundled pcre is too old for s390x (which isn't exactly a good sign)
# /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
--with-pcre-regex=/usr \
# bundled pcre does not support JIT on s390x
# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
--with-libdir="lib/$debMultiarch" \
\
$PHP_EXTRA_CONFIGURE_ARGS \
Expand Down
7 changes: 3 additions & 4 deletions 5.6/jessie/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ ENV PHPIZE_DEPS \
g++ \
gcc \
libc-dev \
libpcre3-dev \
make \
pkg-config \
re2c
Expand Down Expand Up @@ -134,9 +133,9 @@ RUN set -xe \
--with-openssl \
--with-zlib \
\
# bundled pcre is too old for s390x (which isn't exactly a good sign)
# /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
--with-pcre-regex=/usr \
# bundled pcre does not support JIT on s390x
# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
--with-libdir="lib/$debMultiarch" \
\
$PHP_EXTRA_CONFIGURE_ARGS \
Expand Down
7 changes: 3 additions & 4 deletions 5.6/jessie/zts/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ ENV PHPIZE_DEPS \
g++ \
gcc \
libc-dev \
libpcre3-dev \
make \
pkg-config \
re2c
Expand Down Expand Up @@ -134,9 +133,9 @@ RUN set -xe \
--with-openssl \
--with-zlib \
\
# bundled pcre is too old for s390x (which isn't exactly a good sign)
# /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
--with-pcre-regex=/usr \
# bundled pcre does not support JIT on s390x
# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
--with-libdir="lib/$debMultiarch" \
\
$PHP_EXTRA_CONFIGURE_ARGS \
Expand Down
7 changes: 3 additions & 4 deletions 7.0/alpine3.4/cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ ENV PHPIZE_DEPS \
gcc \
libc-dev \
make \
pcre-dev \
pkgconf \
re2c
RUN apk add --no-cache --virtual .persistent-deps \
Expand Down Expand Up @@ -124,9 +123,9 @@ RUN set -xe \
--with-openssl \
--with-zlib \
\
# bundled pcre is too old for s390x (which isn't exactly a good sign)
# /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
--with-pcre-regex=/usr \
# bundled pcre does not support JIT on s390x
# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
\
$PHP_EXTRA_CONFIGURE_ARGS \
&& make -j "$(nproc)" \
Expand Down
7 changes: 3 additions & 4 deletions 7.0/alpine3.4/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ ENV PHPIZE_DEPS \
gcc \
libc-dev \
make \
pcre-dev \
pkgconf \
re2c
RUN apk add --no-cache --virtual .persistent-deps \
Expand Down Expand Up @@ -125,9 +124,9 @@ RUN set -xe \
--with-openssl \
--with-zlib \
\
# bundled pcre is too old for s390x (which isn't exactly a good sign)
# /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
--with-pcre-regex=/usr \
# bundled pcre does not support JIT on s390x
# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
\
$PHP_EXTRA_CONFIGURE_ARGS \
&& make -j "$(nproc)" \
Expand Down
7 changes: 3 additions & 4 deletions 7.0/alpine3.4/zts/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ ENV PHPIZE_DEPS \
gcc \
libc-dev \
make \
pcre-dev \
pkgconf \
re2c
RUN apk add --no-cache --virtual .persistent-deps \
Expand Down Expand Up @@ -125,9 +124,9 @@ RUN set -xe \
--with-openssl \
--with-zlib \
\
# bundled pcre is too old for s390x (which isn't exactly a good sign)
# /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
--with-pcre-regex=/usr \
# bundled pcre does not support JIT on s390x
# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
\
$PHP_EXTRA_CONFIGURE_ARGS \
&& make -j "$(nproc)" \
Expand Down
7 changes: 3 additions & 4 deletions 7.0/jessie/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ ENV PHPIZE_DEPS \
g++ \
gcc \
libc-dev \
libpcre3-dev \
make \
pkg-config \
re2c
Expand Down Expand Up @@ -192,9 +191,9 @@ RUN set -xe \
--with-openssl \
--with-zlib \
\
# bundled pcre is too old for s390x (which isn't exactly a good sign)
# /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
--with-pcre-regex=/usr \
# bundled pcre does not support JIT on s390x
# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
--with-libdir="lib/$debMultiarch" \
\
$PHP_EXTRA_CONFIGURE_ARGS \
Expand Down
7 changes: 3 additions & 4 deletions 7.0/jessie/cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ ENV PHPIZE_DEPS \
g++ \
gcc \
libc-dev \
libpcre3-dev \
make \
pkg-config \
re2c
Expand Down Expand Up @@ -133,9 +132,9 @@ RUN set -xe \
--with-openssl \
--with-zlib \
\
# bundled pcre is too old for s390x (which isn't exactly a good sign)
# /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
--with-pcre-regex=/usr \
# bundled pcre does not support JIT on s390x
# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
--with-libdir="lib/$debMultiarch" \
\
$PHP_EXTRA_CONFIGURE_ARGS \
Expand Down
7 changes: 3 additions & 4 deletions 7.0/jessie/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ ENV PHPIZE_DEPS \
g++ \
gcc \
libc-dev \
libpcre3-dev \
make \
pkg-config \
re2c
Expand Down Expand Up @@ -134,9 +133,9 @@ RUN set -xe \
--with-openssl \
--with-zlib \
\
# bundled pcre is too old for s390x (which isn't exactly a good sign)
# /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
--with-pcre-regex=/usr \
# bundled pcre does not support JIT on s390x
# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
--with-libdir="lib/$debMultiarch" \
\
$PHP_EXTRA_CONFIGURE_ARGS \
Expand Down
7 changes: 3 additions & 4 deletions 7.0/jessie/zts/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ ENV PHPIZE_DEPS \
g++ \
gcc \
libc-dev \
libpcre3-dev \
make \
pkg-config \
re2c
Expand Down Expand Up @@ -134,9 +133,9 @@ RUN set -xe \
--with-openssl \
--with-zlib \
\
# bundled pcre is too old for s390x (which isn't exactly a good sign)
# /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
--with-pcre-regex=/usr \
# bundled pcre does not support JIT on s390x
# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
--with-libdir="lib/$debMultiarch" \
\
$PHP_EXTRA_CONFIGURE_ARGS \
Expand Down
7 changes: 3 additions & 4 deletions 7.1/alpine3.4/cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ ENV PHPIZE_DEPS \
gcc \
libc-dev \
make \
pcre-dev \
pkgconf \
re2c
RUN apk add --no-cache --virtual .persistent-deps \
Expand Down Expand Up @@ -124,9 +123,9 @@ RUN set -xe \
--with-openssl \
--with-zlib \
\
# bundled pcre is too old for s390x (which isn't exactly a good sign)
# /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
--with-pcre-regex=/usr \
# bundled pcre does not support JIT on s390x
# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
\
$PHP_EXTRA_CONFIGURE_ARGS \
&& make -j "$(nproc)" \
Expand Down
7 changes: 3 additions & 4 deletions 7.1/alpine3.4/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ ENV PHPIZE_DEPS \
gcc \
libc-dev \
make \
pcre-dev \
pkgconf \
re2c
RUN apk add --no-cache --virtual .persistent-deps \
Expand Down Expand Up @@ -125,9 +124,9 @@ RUN set -xe \
--with-openssl \
--with-zlib \
\
# bundled pcre is too old for s390x (which isn't exactly a good sign)
# /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
--with-pcre-regex=/usr \
# bundled pcre does not support JIT on s390x
# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
\
$PHP_EXTRA_CONFIGURE_ARGS \
&& make -j "$(nproc)" \
Expand Down
7 changes: 3 additions & 4 deletions 7.1/alpine3.4/zts/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ ENV PHPIZE_DEPS \
gcc \
libc-dev \
make \
pcre-dev \
pkgconf \
re2c
RUN apk add --no-cache --virtual .persistent-deps \
Expand Down Expand Up @@ -125,9 +124,9 @@ RUN set -xe \
--with-openssl \
--with-zlib \
\
# bundled pcre is too old for s390x (which isn't exactly a good sign)
# /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
--with-pcre-regex=/usr \
# bundled pcre does not support JIT on s390x
# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
\
$PHP_EXTRA_CONFIGURE_ARGS \
&& make -j "$(nproc)" \
Expand Down
7 changes: 3 additions & 4 deletions 7.1/jessie/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ ENV PHPIZE_DEPS \
g++ \
gcc \
libc-dev \
libpcre3-dev \
make \
pkg-config \
re2c
Expand Down Expand Up @@ -192,9 +191,9 @@ RUN set -xe \
--with-openssl \
--with-zlib \
\
# bundled pcre is too old for s390x (which isn't exactly a good sign)
# /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
--with-pcre-regex=/usr \
# bundled pcre does not support JIT on s390x
# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
--with-libdir="lib/$debMultiarch" \
\
$PHP_EXTRA_CONFIGURE_ARGS \
Expand Down
7 changes: 3 additions & 4 deletions 7.1/jessie/cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ ENV PHPIZE_DEPS \
g++ \
gcc \
libc-dev \
libpcre3-dev \
make \
pkg-config \
re2c
Expand Down Expand Up @@ -133,9 +132,9 @@ RUN set -xe \
--with-openssl \
--with-zlib \
\
# bundled pcre is too old for s390x (which isn't exactly a good sign)
# /usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture
--with-pcre-regex=/usr \
# bundled pcre does not support JIT on s390x
# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
--with-libdir="lib/$debMultiarch" \
\
$PHP_EXTRA_CONFIGURE_ARGS \
Expand Down
Loading