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.

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
merged 2 commits into from
Nov 29, 2017

Conversation

yosifkit
Copy link
Member

@yosifkit yosifkit commented Nov 29, 2017

Fixes #495. Thanks to @GordonHarley's comment.

I've successfully built this on s390x. 🎉

@yosifkit yosifkit merged commit 32be8a0 into docker-library:master Nov 29, 2017
@yosifkit yosifkit deleted the pcre branch November 29, 2017 21:14
yosifkit added a commit to infosiftr/stackbrew that referenced this pull request Nov 30, 2017
- `ghost` bump to `1.18.2`
- `mongo` bump to `3.6.0-rc7`
- `php` `7.2` GA and pcre-jit fixes docker-library/php#526
- `redis` bump to `4.0.4`
- `tomcat` bumps to `8.5.24` and `9.0.2`
- `wordpress` bump to `4.9.1`
mcnilz added a commit to webvariants/sally-docker that referenced this pull request Dec 1, 2017
@tianon
Copy link
Member

tianon commented Apr 30, 2018

Oh snap, this ./configure arg isn't supported on 5.6:

... [snip] ...

+ ./configure --build=s390x-linux-gnu --with-config-file-path=/usr/local/etc/php --with-config-file-scan-dir=/usr/local/etc/php/conf.d --disable-cgi --enable-ftp --enable-mbstring --enable-mysqlnd --with-curl --with-libedit --with-openssl --with-zlib --without-pcre-jit --with-libdir=lib/s390x-linux-gnu
configure: WARNING: unrecognized options: --without-pcre-jit

... [snip] ...

/usr/src/php/ext/pcre/pcrelib/pcre_jit_compile.c:65:2: error: #error Unsupported architecture

... [snip] ...
root@b67fdb51912b:/usr/src/php# ./configure --help | grep pcre
  --with-pcre-regex=DIR   Include Perl Compatible Regular Expressions support.
  --with-pcre-dir         FILTER: pcre install prefix
  --with-pcre-dir         ZIP: pcre install prefix

@tianon
Copy link
Member

tianon commented Apr 30, 2018

Welp, it was added in php/php-src@54d8053 (which explains why it's 7.0+). Guess at some point we might need some kind of workaround for compiling 5.6 on s390x (although I haven't seen any complaints about it yet).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants