php: update to 5.4.33

One patch was a backport and can be dropped, add Upstream-status to the others.

Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Koen Kooi
2014-10-06 11:55:01 +02:00
committed by Martin Jansa
parent 26043cbe2d
commit 4deb828fff
10 changed files with 93 additions and 106 deletions

View File

@@ -1,12 +1,10 @@
---
sapi/cli/config.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Upstream-status: Inappriate
--- 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)"
;;
diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4
index cdfa1f7..0fe11e3 100644
--- a/sapi/cli/config.m4
+++ b/sapi/cli/config.m4
@@ -36,7 +36,7 @@ if test "$PHP_CLI" != "no"; then
esac
dnl Set executable for tests
@@ -15,5 +13,6 @@
PHP_SUBST(PHP_EXECUTABLE)
dnl Expose to Makefile
PHP_SUBST(SAPI_CLI_PATH)
PHP_SUBST(BUILD_CLI)
--
1.9.3