From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] php: switch to pcre2
Date: Wed, 16 Jan 2019 22:00:16 +0100 [thread overview]
Message-ID: <20190116210016.22121-2-fontaine.fabrice@gmail.com> (raw)
In-Reply-To: <20190116210016.22121-1-fontaine.fabrice@gmail.com>
php moved from pcre to pcre2 since bump to version 7.3 and
http://github.com/php/php-src/commit/a5bc5aed71f7a15f14f33bb31b8e17bf5f327e2d
This fixes a build failure: without this change, if BR2_PACKAGE_PCRE is
set, external pcre support in php is (wrongly) enabled with
--with-pcre-regex but because pcre2 was not found, php fallbacks on
built-in pcre2 without the "SLJIT_SINGLE_THREADED hack"
Fixes:
- http://autobuild.buildroot.org/results/40ef339019203d2cc49d388e222cf17c3ca37944
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/php/php.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/php/php.mk b/package/php/php.mk
index fd428e192a..b6b17a1562 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -243,9 +243,9 @@ endef
PHP_POST_CONFIGURE_HOOKS += PHP_DISABLE_VALGRIND
### Use external PCRE if it's available
-ifeq ($(BR2_PACKAGE_PCRE),y)
+ifeq ($(BR2_PACKAGE_PCRE2),y)
PHP_CONF_OPTS += --with-pcre-regex=$(STAGING_DIR)/usr
-PHP_DEPENDENCIES += pcre
+PHP_DEPENDENCIES += pcre2
else
# The bundled pcre library is not configurable through ./configure options,
# and by default is configured to be thread-safe, so it wants pthreads. So
--
2.14.1
next prev parent reply other threads:[~2019-01-16 21:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-16 21:00 [Buildroot] [PATCH 1/2] Revert "package/php: fix building pcre extension" Fabrice Fontaine
2019-01-16 21:00 ` Fabrice Fontaine [this message]
2019-01-19 21:22 ` [Buildroot] [PATCH 2/2] php: switch to pcre2 Adam Duskett
2019-01-19 21:35 ` Peter Korsgaard
2019-01-19 21:35 ` [Buildroot] [PATCH 1/2] Revert "package/php: fix building pcre extension" Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190116210016.22121-2-fontaine.fabrice@gmail.com \
--to=fontaine.fabrice@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox