php: update to 5.4.14

Build tested for AArch64 and x86.
Runtime tested on x86.

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Marcin Juszkiewicz
2013-04-16 12:42:49 +00:00
committed by Martin Jansa
parent 7c292ce287
commit f91950e3ad
5 changed files with 26 additions and 100 deletions

View File

@@ -1,11 +1,19 @@
--- php/configure.in.orig 2011-03-12 02:13:19.000000000 +0100
+++ php/configure.in 2011-03-12 02:14:05.000000000 +0100
@@ -1216,7 +1216,7 @@
PHP_INSTALL_CLI_TARGET="install-cli"
PHP_ADD_SOURCES(sapi/cli, php_cli.c php_cli_readline.c,, cli)
PHP_INSTALLED_SAPIS="cli $PHP_SAPI"
---
sapi/cli/config.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- php-5.4.14.orig/sapi/cli/config.m4
+++ php-5.4.14/sapi/cli/config.m4
@@ -34,11 +34,11 @@ if test "$PHP_CLI" != "no"; then
BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
;;
esac
dnl Set executable for tests
- PHP_EXECUTABLE="\$(top_builddir)/\$(SAPI_CLI_PATH)"
+ PHP_EXECUTABLE="${PHP_NATIVE_DIR}/php"
else
PHP_INSTALLED_SAPIS="$PHP_SAPI"
fi
PHP_SUBST(PHP_EXECUTABLE)
dnl Expose to Makefile
PHP_SUBST(SAPI_CLI_PATH)
PHP_SUBST(BUILD_CLI)