Bump buildroot to version 2017-02
TG-3 #closed
This commit is contained in:
jbnadal
@@ -1,35 +0,0 @@
|
||||
From 1a8714d0b56e06301b3c261eaef93d897ec5d834 Mon Sep 17 00:00:00 2001
|
||||
From: Floris Bos <bos@je-eigen-domein.nl>
|
||||
Date: Fri, 1 May 2015 15:28:55 +0200
|
||||
Subject: [PATCH] Fix php-fpm.service.in
|
||||
|
||||
- Expand file paths.
|
||||
- Remove obsolete After=syslog.target. Syslog is socket activated nowadays.
|
||||
|
||||
Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
|
||||
---
|
||||
sapi/fpm/php-fpm.service.in | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/sapi/fpm/php-fpm.service.in b/sapi/fpm/php-fpm.service.in
|
||||
index a2df30e..c135f04 100644
|
||||
--- a/sapi/fpm/php-fpm.service.in
|
||||
+++ b/sapi/fpm/php-fpm.service.in
|
||||
@@ -1,11 +1,11 @@
|
||||
[Unit]
|
||||
Description=The PHP FastCGI Process Manager
|
||||
-After=syslog.target network.target
|
||||
+After=network.target
|
||||
|
||||
[Service]
|
||||
Type=@php_fpm_systemd@
|
||||
-PIDFile=@localstatedir@/run/php-fpm.pid
|
||||
-ExecStart=@sbindir@/php-fpm --nodaemonize --fpm-config @sysconfdir@/php-fpm.conf
|
||||
+PIDFile=@EXPANDED_LOCALSTATEDIR@/run/php-fpm.pid
|
||||
+ExecStart=@EXPANDED_SBINDIR@/php-fpm --nodaemonize --fpm-config @EXPANDED_SYSCONFDIR@/php-fpm.conf
|
||||
ExecReload=/bin/kill -USR2 $MAINPID
|
||||
|
||||
[Install]
|
||||
--
|
||||
2.7.4
|
||||
|
||||
16
bsp/buildroot/package/php/0007-avoid-bfin-gcc-segfault.patch
Normal file
16
bsp/buildroot/package/php/0007-avoid-bfin-gcc-segfault.patch
Normal file
@@ -0,0 +1,16 @@
|
||||
Avoid gcc segmentation fault
|
||||
|
||||
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
|
||||
|
||||
diff -Nur php-7.0.12.orig/Zend/zend_portability.h php-7.0.12/Zend/zend_portability.h
|
||||
--- php-7.0.12.orig/Zend/zend_portability.h 2016-10-13 16:04:17.000000000 +0200
|
||||
+++ php-7.0.12/Zend/zend_portability.h 2016-11-08 02:49:39.118388999 +0100
|
||||
@@ -97,7 +97,7 @@
|
||||
|
||||
#if defined(ZEND_WIN32) && !defined(__clang__)
|
||||
# define ZEND_ASSUME(c) __assume(c)
|
||||
-#elif ((defined(__GNUC__) && ZEND_GCC_VERSION >= 4005) || __has_builtin(__builtin_unreachable)) && PHP_HAVE_BUILTIN_EXPECT
|
||||
+#elif ((defined(__GNUC__) && ZEND_GCC_VERSION >= 4005) || __has_builtin(__builtin_unreachable)) && PHP_HAVE_BUILTIN_EXPECT && !defined(__bfin__)
|
||||
# define ZEND_ASSUME(c) do { \
|
||||
if (__builtin_expect(!(c), 0)) __builtin_unreachable(); \
|
||||
} while (0)
|
||||
@@ -1,47 +0,0 @@
|
||||
From 9ca3de0446fcd31b1561b333020ae0674a83bec7 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Tue, 9 Aug 2016 11:39:10 +0200
|
||||
Subject: [PATCH] phpdbg_prompt: enclose phpdbg_load_module_or_extension() in
|
||||
HAVE_LIBDL
|
||||
|
||||
The phpdbg_load_module_or_extension() function relies on libdl
|
||||
functionality, so it should be enclosed in HAVE_LIBDL to avoid the
|
||||
following build failure when libdl support is not available:
|
||||
|
||||
php-7.0.9/sapi/phpdbg/phpdbg_prompt.c:(.text+0x1c20): undefined reference to `_DL_LOAD'
|
||||
php-7.0.9/sapi/phpdbg/phpdbg_prompt.c:(.text+0x1c36): undefined reference to `_GET_DL_ERROR'
|
||||
php-7.0.9/sapi/phpdbg/phpdbg_prompt.c:(.text+0x1c6a): undefined reference to `_DL_FETCH_SYMBOL'
|
||||
php-7.0.9/sapi/phpdbg/phpdbg_prompt.c:(.text+0x1c7e): undefined reference to `_DL_FETCH_SYMBOL'
|
||||
php-7.0.9/sapi/phpdbg/phpdbg_prompt.c:(.text+0x1dc6): undefined reference to `_DL_UNLOAD'
|
||||
|
||||
This function is only called in the "dl" debug command, inside an
|
||||
HAVE_LIBDL condition.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
sapi/phpdbg/phpdbg_prompt.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c
|
||||
index 6f73d30..6768dc5 100644
|
||||
--- a/sapi/phpdbg/phpdbg_prompt.c
|
||||
+++ b/sapi/phpdbg/phpdbg_prompt.c
|
||||
@@ -1019,6 +1019,7 @@ static int add_zendext_info(zend_extension *ext) /* {{{ */ {
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
+#ifdef HAVE_LIBDL
|
||||
PHPDBG_API const char *phpdbg_load_module_or_extension(char **path, char **name) /* {{{ */ {
|
||||
DL_HANDLE handle;
|
||||
char *extension_dir;
|
||||
@@ -1158,6 +1159,7 @@ quit:
|
||||
DL_UNLOAD(handle);
|
||||
return NULL;
|
||||
}
|
||||
+#endif
|
||||
/* }}} */
|
||||
|
||||
PHPDBG_COMMAND(dl) /* {{{ */
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
From 1622f24fde4220967bd907bf8f0325d444bf9339 Mon Sep 17 00:00:00 2001
|
||||
From: Andy Postnikov <apostnikov@gmail.com>
|
||||
Date: Sat, 10 Dec 2016 23:51:17 +0300
|
||||
Subject: [PATCH] Fix bug #70015 - Compilation failure on aarch64
|
||||
|
||||
Fixes build at -O0.
|
||||
|
||||
[From pull request https://github.com/php/php-src/pull/2236.]
|
||||
Signed-off-by: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
|
||||
---
|
||||
Zend/zend_multiply.h | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Zend/zend_multiply.h b/Zend/zend_multiply.h
|
||||
index 75769db..fbd69ab 100644
|
||||
--- a/Zend/zend_multiply.h
|
||||
+++ b/Zend/zend_multiply.h
|
||||
@@ -75,8 +75,8 @@
|
||||
__asm__("mul %0, %2, %3\n" \
|
||||
"smulh %1, %2, %3\n" \
|
||||
"sub %1, %1, %0, asr #63\n" \
|
||||
- : "=X"(__tmpvar), "=X"(usedval) \
|
||||
- : "X"(a), "X"(b)); \
|
||||
+ : "=&r"(__tmpvar), "=&r"(usedval) \
|
||||
+ : "r"(a), "r"(b)); \
|
||||
if (usedval) (dval) = (double) (a) * (double) (b); \
|
||||
else (lval) = __tmpvar; \
|
||||
} while (0)
|
||||
@@ -0,0 +1,49 @@
|
||||
From 4342bdea7a1a21430ce0d051fa4387441166c473 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fabrice.fontaine@orange.com>
|
||||
Date: Sun, 11 Dec 2016 23:12:46 +0100
|
||||
Subject: [PATCH] Call apxs with correct prefix
|
||||
|
||||
php uses apache's apxs script from staging directory to install libphp
|
||||
dynamic library and update /etc/apache2/httpd.conf in the staging and target
|
||||
directories. Here is the full command line:
|
||||
"apxs -S LIBEXECDIR='$(INSTALL_ROOT)/usr/modules'
|
||||
-S SYSCONFDIR='$(INSTALL_ROOT)/etc/apache2' -i -a -n php7"
|
||||
This does not work for target directory as apxs sets the full path of the
|
||||
library and not the relative one. Indeed, apxs is smart enough to substitute
|
||||
away the prefix specified in $(STAGING_DIR)/usr/build/config_vars.mk so
|
||||
httpd.conf will only be correct in the staging directory.
|
||||
To fix this, add -S PREFIX='$(INSTALL_ROOT)/usr' to apxs call in configure
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
|
||||
---
|
||||
sapi/apache2handler/config.m4 | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
|
||||
index 2e64b21..f5bf002 100644
|
||||
--- a/sapi/apache2handler/config.m4
|
||||
+++ b/sapi/apache2handler/config.m4
|
||||
@@ -66,10 +66,12 @@ if test "$PHP_APXS2" != "no"; then
|
||||
AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
|
||||
fi
|
||||
|
||||
+ APXS_PREFIX='$(INSTALL_ROOT)'/usr
|
||||
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
|
||||
if test -z `$APXS -q SYSCONFDIR`; then
|
||||
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
|
||||
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
||||
+ -S PREFIX='$APXS_PREFIX' \
|
||||
-i -n php7"
|
||||
else
|
||||
APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
|
||||
@@ -77,6 +79,7 @@ if test "$PHP_APXS2" != "no"; then
|
||||
\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
|
||||
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
||||
-S SYSCONFDIR='$APXS_SYSCONFDIR' \
|
||||
+ -S PREFIX='$APXS_PREFIX' \
|
||||
-i -a -n php7"
|
||||
fi
|
||||
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@@ -113,10 +113,6 @@ endif
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_MYSQLI
|
||||
bool "Mysqli"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_USE_MMU # mysql
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
|
||||
select BR2_PACKAGE_MYSQL
|
||||
help
|
||||
MySQL Improved extension support
|
||||
|
||||
@@ -135,17 +131,9 @@ if BR2_PACKAGE_PHP_EXT_PDO
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_PDO_MYSQL
|
||||
bool "MySQL"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_USE_MMU # mysql
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
|
||||
select BR2_PACKAGE_MYSQL
|
||||
help
|
||||
PDO driver for MySQL
|
||||
|
||||
comment "MySQL drivers need a toolchain w/ C++, threads"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_PDO_POSTGRESQL
|
||||
bool "PostgreSQL"
|
||||
select BR2_PACKAGE_POSTGRESQL
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
config BR2_PACKAGE_PHP
|
||||
bool "php"
|
||||
select BR2_PACKAGE_PHP_SAPI_CGI if \
|
||||
!BR2_PACKAGE_PHP_SAPI_APACHE && \
|
||||
!BR2_PACKAGE_PHP_SAPI_CLI && \
|
||||
!BR2_PACKAGE_PHP_SAPI_FPM && \
|
||||
BR2_USE_MMU
|
||||
select BR2_PACKAGE_PHP_SAPI_CLI if !BR2_USE_MMU
|
||||
help
|
||||
PHP is a widely-used general-purpose scripting
|
||||
language that is especially suited for Web development
|
||||
@@ -9,61 +15,32 @@ config BR2_PACKAGE_PHP
|
||||
|
||||
if BR2_PACKAGE_PHP
|
||||
|
||||
config BR2_PACKAGE_PHP_CLI
|
||||
bool
|
||||
|
||||
config BR2_PACKAGE_PHP_CGI
|
||||
bool
|
||||
|
||||
config BR2_PACKAGE_PHP_FPM
|
||||
bool
|
||||
|
||||
choice
|
||||
prompt "Interface"
|
||||
default BR2_PACKAGE_PHP_SAPI_CGI
|
||||
config BR2_PACKAGE_PHP_SAPI_APACHE
|
||||
bool "Apache interface"
|
||||
depends on BR2_PACKAGE_APACHE
|
||||
help
|
||||
Select the PHP interface(s).
|
||||
Apache module
|
||||
|
||||
config BR2_PACKAGE_PHP_SAPI_CGI
|
||||
bool "CGI"
|
||||
bool "CGI interface"
|
||||
# CGI uses fork()
|
||||
depends on BR2_USE_MMU
|
||||
select BR2_PACKAGE_PHP_CGI
|
||||
help
|
||||
Common Gateway Interface
|
||||
|
||||
config BR2_PACKAGE_PHP_SAPI_CLI
|
||||
bool "CLI"
|
||||
select BR2_PACKAGE_PHP_CLI
|
||||
bool "CLI interface"
|
||||
help
|
||||
Command Line Interface
|
||||
|
||||
config BR2_PACKAGE_PHP_SAPI_FPM
|
||||
bool "FPM"
|
||||
bool "FPM interface"
|
||||
depends on BR2_USE_MMU
|
||||
select BR2_PACKAGE_PHP_FPM
|
||||
# "Sparc v8 and predecessors are not and will not be supported"
|
||||
depends on !BR2_sparc
|
||||
help
|
||||
PHP-FPM (FastCGI Process Manager)
|
||||
|
||||
config BR2_PACKAGE_PHP_SAPI_CLI_CGI
|
||||
bool "CGI and CLI"
|
||||
# CGI uses fork()
|
||||
depends on BR2_USE_MMU
|
||||
select BR2_PACKAGE_PHP_CLI
|
||||
select BR2_PACKAGE_PHP_CGI
|
||||
help
|
||||
Command line and Common gateway interfaces
|
||||
|
||||
config BR2_PACKAGE_PHP_SAPI_CLI_FPM
|
||||
bool "FPM and CLI"
|
||||
depends on BR2_USE_MMU
|
||||
select BR2_PACKAGE_PHP_CLI
|
||||
select BR2_PACKAGE_PHP_FPM
|
||||
help
|
||||
Command line and PHP-FPM (FastCGI Process Manager)
|
||||
|
||||
endchoice
|
||||
|
||||
source "package/php/Config.ext"
|
||||
|
||||
endif
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
[www]
|
||||
# Only start children when there are requests to be processed
|
||||
pm = ondemand
|
||||
# Terminate them again after there haven't been any for 2 minutes
|
||||
pm.process_idle_timeout = 120s
|
||||
# Maximum number of children processing PHP requests concurrently
|
||||
pm.max_children = 5
|
||||
|
||||
listen = /var/run/php-fpm.sock
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From http://php.net/downloads.php
|
||||
sha256 970c322ba3e472cb0264b8ba9d4d92e87918da5d0cca53c4aba2a70545b8626d php-7.0.9.tar.xz
|
||||
sha256 b3565b0c1441064eba204821608df1ec7367abff881286898d900c2c2a5ffe70 php-7.1.1.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PHP_VERSION = 7.0.9
|
||||
PHP_VERSION = 7.1.1
|
||||
PHP_SITE = http://www.php.net/distributions
|
||||
PHP_SOURCE = php-$(PHP_VERSION).tar.xz
|
||||
PHP_INSTALL_STAGING = YES
|
||||
@@ -19,6 +19,7 @@ PHP_CONF_OPTS = \
|
||||
--disable-all \
|
||||
--without-pear \
|
||||
--with-config-file-path=/etc \
|
||||
--disable-phpdbg \
|
||||
--disable-rpath
|
||||
PHP_CONF_ENV = \
|
||||
ac_cv_func_strcasestr=yes \
|
||||
@@ -76,9 +77,19 @@ else
|
||||
PHP_CONF_ENV += ac_cv_func_dlopen=no ac_cv_lib_dl_dlopen=no
|
||||
endif
|
||||
|
||||
PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_CLI),,--disable-cli)
|
||||
PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_CGI),,--disable-cgi)
|
||||
PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_FPM),--enable-fpm,--disable-fpm)
|
||||
PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_SAPI_CLI),--enable-cli,--disable-cli)
|
||||
PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_SAPI_CGI),--enable-cgi,--disable-cgi)
|
||||
PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_SAPI_FPM),--enable-fpm,--disable-fpm)
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_SAPI_APACHE),y)
|
||||
PHP_DEPENDENCIES += apache
|
||||
PHP_CONF_OPTS += --with-apxs2=$(STAGING_DIR)/usr/bin/apxs
|
||||
|
||||
# Enable thread safety option if Apache MPM is event or worker
|
||||
ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT)$(BR2_PACKAGE_APACHE_MPM_WORKER),y)
|
||||
PHP_CONF_OPTS += --enable-maintainer-zts
|
||||
endif
|
||||
endif
|
||||
|
||||
### Extensions
|
||||
PHP_CONF_OPTS += \
|
||||
@@ -181,8 +192,7 @@ endif
|
||||
|
||||
### Native SQL extensions
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_MYSQLI),y)
|
||||
PHP_CONF_OPTS += --with-mysqli=$(STAGING_DIR)/usr/bin/mysql_config
|
||||
PHP_DEPENDENCIES += mysql
|
||||
PHP_CONF_OPTS += --with-mysqli
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE),y)
|
||||
PHP_CONF_OPTS += --with-sqlite3=$(STAGING_DIR)/usr
|
||||
@@ -199,8 +209,7 @@ PHP_DEPENDENCIES += sqlite
|
||||
PHP_CFLAGS += -DSQLITE_OMIT_LOAD_EXTENSION
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),y)
|
||||
PHP_CONF_OPTS += --with-pdo-mysql=$(STAGING_DIR)/usr
|
||||
PHP_DEPENDENCIES += mysql
|
||||
PHP_CONF_OPTS += --with-pdo-mysql
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_POSTGRESQL),y)
|
||||
PHP_CONF_OPTS += --with-pdo-pgsql=$(STAGING_DIR)/usr
|
||||
@@ -212,6 +221,11 @@ PHP_DEPENDENCIES += unixodbc
|
||||
endif
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_PACKAGE_PHP_EXT_MYSQLI)$(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),)
|
||||
# Set default MySQL unix socket to what the MySQL server is using by default
|
||||
PHP_CONF_OPTS += --with-mysql-sock=$(MYSQL_SOCKET)
|
||||
endif
|
||||
|
||||
define PHP_DISABLE_PCRE_JIT
|
||||
$(SED) '/^#define SUPPORT_JIT/d' $(@D)/ext/pcre/pcrelib/config.h
|
||||
endef
|
||||
@@ -281,7 +295,7 @@ PHP_CONF_OPTS += \
|
||||
PHP_DEPENDENCIES += jpeg libpng freetype
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_FPM),y)
|
||||
ifeq ($(BR2_PACKAGE_PHP_SAPI_FPM),y)
|
||||
define PHP_INSTALL_INIT_SYSV
|
||||
$(INSTALL) -D -m 0755 $(@D)/sapi/fpm/init.d.php-fpm \
|
||||
$(TARGET_DIR)/etc/init.d/S49php-fpm
|
||||
|
||||
Reference in New Issue
Block a user