Revert "package/php: fix building pcre extension"
PATCH 1/2 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
--- package/php/php.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/php/php.mk +1 -1
@@ -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,
Signature · 1 line
2.14.1
PATCH 2/2 php: switch to pcre2
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
--- package/php/php.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/php/php.mk +2 -2
@@ -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
Signature · 1 line
2.14.1
PATCH 2/2 php: switch to pcre2
All;
Quoted 36 lines · Fabrice Fontaine
php moved from pcre to pcre2 since bump to version 7.3 and
http://github.com/php/php-src/commit/a5bc5aed71f7a15f14f33bb31b8e17bf5f327e2dThis fixes a build failure: without this change, if
BR2_PACKAGE_PCREis 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_THREADEDhack"Fixes:
- http://autobuild.buildroot.org/results/40ef339019203d2cc49d388e222cf17c3ca37944Signed-off-by Fabrice Fontaine <[email protected]>--- package/php/php.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)package/php/php.mk +2
-3@@ -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
Quoted 4 lines
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
This also fixes
http://autobuild.buildroot.net/results/7aa/7aaa791d63e4c93ccb39f2c29964c9840def1e34
Tested by Adam Duskett <[email protected]>
PATCH 2/2 php: switch to pcre2
In reply to Fabrice FontaineQuoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
php moved from pcre to pcre2 since bump to version 7.3 and
http://github.com/php/php-src/commit/a5bc5aed71f7a15f14f33bb31b8e17bf5f327e2dThis fixes a build failure: without this change, if
BR2_PACKAGE_PCREis 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_THREADEDhack"
Quoted 4 lines
Fixes:
- http://autobuild.buildroot.org/results/40ef339019203d2cc49d388e222cf17c3ca37944Signed-off-by Fabrice Fontaine <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/2 Revert "package/php: fix building pcre extension"
In reply to Fabrice FontaineQuoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
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/a5bc5aed71f7a15f14f33bb31b8e17bf5f327e2dThis patch will always disable external pcre2 support and raise a build failure when toolchaine does not have pthread
Signed-off-by Fabrice Fontaine <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard