* [Buildroot] [PATCH 1/2] Revert "package/php: fix building pcre extension"
@ 2019-01-16 21:00 Fabrice Fontaine
2019-01-16 21:00 ` [Buildroot] [PATCH 2/2] php: switch to pcre2 Fabrice Fontaine
2019-01-19 21:35 ` [Buildroot] [PATCH 1/2] Revert "package/php: fix building pcre extension" Peter Korsgaard
0 siblings, 2 replies; 5+ messages in thread
From: Fabrice Fontaine @ 2019-01-16 21:00 UTC (permalink / raw)
To: buildroot
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>
---
package/php/php.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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,
--
2.14.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/2] php: switch to pcre2
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
2019-01-19 21:22 ` 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
1 sibling, 2 replies; 5+ messages in thread
From: Fabrice Fontaine @ 2019-01-16 21:00 UTC (permalink / raw)
To: buildroot
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/2] php: switch to pcre2
2019-01-16 21:00 ` [Buildroot] [PATCH 2/2] php: switch to pcre2 Fabrice Fontaine
@ 2019-01-19 21:22 ` Adam Duskett
2019-01-19 21:35 ` Peter Korsgaard
1 sibling, 0 replies; 5+ messages in thread
From: Adam Duskett @ 2019-01-19 21:22 UTC (permalink / raw)
To: buildroot
All;
</aduskett@gmail.com>
On Wed, Jan 16, 2019 at 4:00 PM Fabrice Fontaine
<fontaine.fabrice@gmail.com> wrote:
>
> 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
>
> _______________________________________________
> 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 <aduskett@gmail.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/2] Revert "package/php: fix building pcre extension"
2019-01-16 21:00 [Buildroot] [PATCH 1/2] Revert "package/php: fix building pcre extension" Fabrice Fontaine
2019-01-16 21:00 ` [Buildroot] [PATCH 2/2] php: switch to pcre2 Fabrice Fontaine
@ 2019-01-19 21:35 ` Peter Korsgaard
1 sibling, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2019-01-19 21:35 UTC (permalink / raw)
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> 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/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>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/2] php: switch to pcre2
2019-01-16 21:00 ` [Buildroot] [PATCH 2/2] php: switch to pcre2 Fabrice Fontaine
2019-01-19 21:22 ` Adam Duskett
@ 2019-01-19 21:35 ` Peter Korsgaard
1 sibling, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2019-01-19 21:35 UTC (permalink / raw)
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> 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>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-01-19 21:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-16 21:00 [Buildroot] [PATCH 1/2] Revert "package/php: fix building pcre extension" Fabrice Fontaine
2019-01-16 21:00 ` [Buildroot] [PATCH 2/2] php: switch to pcre2 Fabrice Fontaine
2019-01-19 21:22 ` 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
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.