diff options
| author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2019-01-16 22:00:15 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2019-01-19 22:33:43 +0100 |
| commit | 392a50b2e34bd31138b6603684166742fa5c37f7 (patch) | |
| tree | e8713aadea37ef045fcec01ef4dbffa80b8c84ee /package/php/php.mk | |
| parent | ca70c77a880442e901e3ad6163a0f67d92075958 (diff) | |
| download | buildroot-392a50b2e34bd31138b6603684166742fa5c37f7.tar.gz buildroot-392a50b2e34bd31138b6603684166742fa5c37f7.zip | |
Revert "package/php: fix building pcre extension"
This reverts commit 745f884e41b5f350296e8448f5fc31d20f67a077.
This was the wrong fix: issue is that php moves from pcre to pcre2 since
version 7.3.0 and
http://github.com/php/php-src/commit/a5bc5aed71f7a15f14f33bb31b8e17bf5f327e2d
This patch will always disable external pcre2 support and raise a build
failure when toolchaine does not have pthread
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/php/php.mk')
| -rw-r--r-- | package/php/php.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/php/php.mk b/package/php/php.mk index 7d7d78353b..fd428e192a 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -244,7 +244,7 @@ PHP_POST_CONFIGURE_HOOKS += PHP_DISABLE_VALGRIND ### Use external PCRE if it's available ifeq ($(BR2_PACKAGE_PCRE),y) -PHP_CONF_OPTS += --with-pcre-regex +PHP_CONF_OPTS += --with-pcre-regex=$(STAGING_DIR)/usr PHP_DEPENDENCIES += pcre else # The bundled pcre library is not configurable through ./configure options, |
