1 files changed, 17 insertions, 9 deletions

diff --git a/meta-oe/recipes-devtools/php/php/php_exec_native.patch b/meta-oe/recipes-devtools/php/php/php_exec_native.patch
index a563c9a5e2..31be1b70b7 100644
--- a/meta-oe/recipes-devtools/php/php/php_exec_native.patch
+++ b/meta-oe/recipes-devtools/php/php/php_exec_native.patch
@@ -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)