mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-01 06:21:56 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/php: needs pcre2

Browse Source 
Since 2008 pcre is a hard-dependency of php:
aa64c6727c

Instead of optionally depending on the pcre2 package and building the
bundled pcre2 code of php in case BR2_PACKAGE_PCRE2 was not selected
we let php depend on pcre2.

While being at it rename the pcre-related configure option due to
upstream commit:
c1a22f3d4e

Fixes:
http://autobuild.buildroot.net/results/4a5/4a582af6b66c59a61b75a7047d8530202972ebdd/
because the pcre2 package already contains the fix for mips r6.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
[yann.morin.1998@free.fr: keep the JIT option]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit fabb1243ab)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Bernd Kuhls
2020-12-27 19:31:45 +01:00
committed by Peter Korsgaard
parent a07bf9d0f9
commit f470f55e10
2 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package/php/Config.in
View File

@@ -10,6 +10,7 @@ config BR2_PACKAGE_PHP
!BR2_PACKAGE_PHP_SAPI_FPM && \ !BR2_PACKAGE_PHP_SAPI_FPM && \
BR2_USE_MMU BR2_USE_MMU
select BR2_PACKAGE_PHP_SAPI_CLI if !BR2_USE_MMU select BR2_PACKAGE_PHP_SAPI_CLI if !BR2_USE_MMU
select BR2_PACKAGE_PCRE2
help help
PHP is a widely-used general-purpose scripting PHP is a widely-used general-purpose scripting
language that is especially suited for Web development language that is especially suited for Web development

23
package/php/php.mk
View File

@@ -10,7 +10,7 @@ PHP_SOURCE = php-$(PHP_VERSION).tar.xz
PHP_INSTALL_STAGING = YES PHP_INSTALL_STAGING = YES
PHP_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install PHP_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install
PHP_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install PHP_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install
PHP_DEPENDENCIES = host-pkgconf PHP_DEPENDENCIES = host-pkgconf pcre2
PHP_LICENSE = PHP-3.01 PHP_LICENSE = PHP-3.01
PHP_LICENSE_FILES = LICENSE PHP_LICENSE_FILES = LICENSE
PHP_CONF_OPTS = \ PHP_CONF_OPTS = \
@@ -18,6 +18,7 @@ PHP_CONF_OPTS = \
--infodir=/usr/share/info \ --infodir=/usr/share/info \
--with-config-file-scan-dir=/etc/php.d \ --with-config-file-scan-dir=/etc/php.d \
--disable-all \ --disable-all \
--with-external-pcre \
--without-pear \ --without-pear \
--with-config-file-path=/etc \ --with-config-file-path=/etc \
--disable-phpdbg \ --disable-phpdbg \
@@ -258,11 +259,6 @@ define PHP_DISABLE_VALGRIND
endef endef
PHP_POST_CONFIGURE_HOOKS += PHP_DISABLE_VALGRIND PHP_POST_CONFIGURE_HOOKS += PHP_DISABLE_VALGRIND
### Use external PCRE if it's available
ifeq ($(BR2_PACKAGE_PCRE2),y)
PHP_CONF_OPTS += --with-pcre-regex=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += pcre2
ifeq ($(BR2_PACKAGE_PCRE2_JIT),y) ifeq ($(BR2_PACKAGE_PCRE2_JIT),y)
PHP_CONF_OPTS += --with-pcre-jit=yes PHP_CONF_OPTS += --with-pcre-jit=yes
PHP_CONF_ENV += ac_cv_have_pcre2_jit=yes PHP_CONF_ENV += ac_cv_have_pcre2_jit=yes
@@ -271,21 +267,6 @@ PHP_CONF_OPTS += --with-pcre-jit=no
PHP_CONF_ENV += ac_cv_have_pcre2_jit=no PHP_CONF_ENV += ac_cv_have_pcre2_jit=no
endif endif
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
# we must explicitly tell it when we don't have threads.
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
PHP_CFLAGS += -DSLJIT_SINGLE_THREADED=1
endif
# check ext/pcre/pcrelib/sljit/sljitConfigInternal.h for supported archs
ifeq ($(BR2_i386)$(BR2_x86_64)$(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_sparc),y)
PHP_CONF_OPTS += --with-pcre-jit
else
PHP_CONF_OPTS += --without-pcre-jit
endif
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_CURL),y) ifeq ($(BR2_PACKAGE_PHP_EXT_CURL),y)
PHP_CONF_OPTS += --with-curl PHP_CONF_OPTS += --with-curl
PHP_DEPENDENCIES += libcurl PHP_DEPENDENCIES += libcurl