15 files changed, 28 insertions, 106 deletions
diff --git a/meta-aarch64/recipes-devtools/php/.php.inc.swp b/meta-aarch64/recipes-devtools/php/.php.inc.swp
deleted file mode 100644
index b21a92cc..00000000
--- a/meta-aarch64/recipes-devtools/php/.php.inc.swp
+++ /dev/null
diff --git a/meta-aarch64/recipes-devtools/php/php/php-m4-divert.patch b/meta-aarch64/recipes-devtools/php/php/php-m4-divert.patch
deleted file mode 100644
index dfc7b643..00000000
--- a/meta-aarch64/recipes-devtools/php/php/php-m4-divert.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Patch taken from
-
-http://cvs.pld-linux.org/cgi-bin/cvsweb/packages/php/php-m4-divert.patch?rev=1.1
-
-diff -ur php-5.2.10.org/configure.in php-5.2.10/configure.in
---- php-5.2.10.org/configure.in	2009-06-17 14:22:41.000000000 +0200
-+++ php-5.2.10/configure.in	2009-08-18 12:16:25.317640253 +0200
-@@ -1,7 +1,7 @@
- ## $Id: configure.in,v 1.579.2.52.2.139 2009/06/17 12:22:41 iliaa Exp $ -*- autoconf -*-
- dnl ## Process this file with autoconf to produce a configure script.
- 
--divert(1)
-+divert(1001)
- 
- dnl ## Diversion 1 is the autoconf + automake setup phase. We also
- dnl ## set the PHP version, deal with platform-specific compile
-@@ -263,7 +263,7 @@
- sinclude(TSRM/tsrm.m4)
- 
- 
--divert(2)
-+divert(1002)
- 
- dnl ## Diversion 2 is where we set PHP-specific options and come up
- dnl ## with reasonable default values for them. We check for pthreads here
-@@ -302,7 +302,7 @@
-   PTHREADS_FLAGS
- fi
- 
--divert(3)
-+divert(1003)
- 
- dnl ## In diversion 3 we check for compile-time options to the PHP
- dnl ## core and how to deal with different system dependencies.
-@@ -661,7 +661,7 @@
-   PHP_CRYPT_R_STYLE
- fi
- 
--divert(4)
-+divert(1004)
- 
- dnl ## In diversion 4 we check user-configurable general settings.
- 
-@@ -902,7 +902,7 @@
-   AC_MSG_RESULT([using system default])
- fi
- 
--divert(5)
-+divert(1005)
- 
- dnl ## In diversion 5 we check which extensions should be compiled.
- dnl ## All of these are normally in the extension directories.
-diff -ur php-5.2.10.org/ext/standard/config.m4 php-5.2.10/ext/standard/config.m4
---- php-5.2.10.org/ext/standard/config.m4	2007-07-11 13:56:03.000000000 +0200
-+++ php-5.2.10/ext/standard/config.m4	2009-08-18 12:16:25.317640253 +0200
-@@ -1,6 +1,6 @@
- dnl $Id: config.m4,v 1.80.2.3.2.3 2007/07/11 11:56:03 jani Exp $ -*- autoconf -*-
- 
--divert(3)dnl
-+divert(1003)dnl
- 
- dnl
- dnl Check if flush should be called explicitly after buffered io
-@@ -205,7 +205,7 @@
- AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan)
- AC_FUNC_FNMATCH	
- 
--divert(5)dnl
-+divert(1005)dnl
- 
- dnl
- dnl Check for regex library type
-diff -ur php-5.2.10.org/scripts/phpize.m4 php-5.2.10/scripts/phpize.m4
---- php-5.2.10.org/scripts/phpize.m4	2009-06-02 21:54:22.000000000 +0200
-+++ php-5.2.10/scripts/phpize.m4	2009-08-18 12:16:25.317640253 +0200
-@@ -1,6 +1,6 @@
- dnl This file becomes configure.in for self-contained extensions.
- 
--divert(1)
-+divert(1001)
- 
- AC_PREREQ(2.13)
- AC_INIT(config.m4)
diff --git a/meta-aarch64/recipes-devtools/php/php/php_exec_native.patch b/meta-aarch64/recipes-devtools/php/php/php_exec_native.patch
deleted file mode 100644
index a563c9a5..00000000
--- a/meta-aarch64/recipes-devtools/php/php/php_exec_native.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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"
--  PHP_EXECUTABLE="\$(top_builddir)/\$(SAPI_CLI_PATH)"
-+  PHP_EXECUTABLE="${PHP_NATIVE_DIR}/php"
- else
-   PHP_INSTALLED_SAPIS="$PHP_SAPI"
- fi
diff --git a/meta-aarch64/recipes-devtools/php/php.inc b/meta-linaro/recipes-devtools/php/php.inc
index 9fb65dd8..225c3d72 100644
--- a/meta-aarch64/recipes-devtools/php/php.inc
+++ b/meta-linaro/recipes-devtools/php/php.inc
@@ -7,7 +7,7 @@ DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \
            libc-client openssl sqlite3"
 DEPENDS_virtclass-native = "zlib-native libxml2-native"
 
-INC_PR = "r5"
+INC_PR = "r4"
 
 SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2"
 
@@ -30,15 +30,15 @@ EXTRA_OECONF = "--enable-mbstring --enable-discard-path --enable-wddx \
                 --disable-embedded-mysqli \
                 --with-mysql="${STAGING_DIR_TARGET}${prefix}" \
                 --with-mysqli="${STAGING_BINDIR_CROSS}/mysql_config" \
-		--with-sqlite3=${STAGING_LIBDIR}/.. --enable-sqlite-utf8 \
+        --with-sqlite3=${STAGING_LIBDIR}/.. --enable-sqlite-utf8 \
                 --with-pdo-mysql="${STAGING_BINDIR_CROSS}/mysql_config" \
                 --with-pdo-sqlite=${STAGING_LIBDIR}/.. ${COMMON_EXTRA_OECONF} \
-               "
+"
 EXTRA_OECONF_virtclass-native = "--with-cgi --without-libpng --without-libjpeg \
                 --with-zlib --with-zlib-dir=${STAGING_LIBDIR_NATIVE}/.. \
                 --with-libxml-dir=${STAGING_BINDIR_NATIVE} \
                 ${COMMON_EXTRA_OECONF} \
-               "
+"
 
 LIBS_virtclass-native = " -lxml2 "
 LIBS_pn-php =" -lpthread "
@@ -52,7 +52,6 @@ CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -D_GNU_SOURCE"
 acpaths = ""
 
 do_install  () {
-    install -d ${D}${libdir}/php
     oe_runmake 'INSTALL_ROOT=${D}' install
 }
 
@@ -65,7 +64,6 @@ do_install_append_pn-php-native() {
 # fixme
 do_install_append_pn-php() {
     install -d ${D}/${sysconfdir}/
-
     if [ -d ${D}/${STAGING_DIR_NATIVE}/${sysconfdir} ];then
          mv ${D}/${STAGING_DIR_NATIVE}/${sysconfdir}/* ${D}/${sysconfdir}/
     fi
@@ -86,8 +84,8 @@ do_install_append_pn-php() {
     install -m 0755 ${S}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm
     TMP=`dirname ${D}/${TMPDIR}`
     while test ${TMP} != ${D}; do
-      rmdir ${TMP}
-      TMP=`dirname ${TMP}`;
+        rmdir ${TMP}
+        TMP=`dirname ${TMP}`;
     done
 }
 
diff --git a/meta-aarch64/recipes-devtools/php/php/0001-php-don-t-use-broken-wrapper-for-mkdir.patch b/meta-linaro/recipes-devtools/php/php/0001-php-don-t-use-broken-wrapper-for-mkdir.patch
index 9b71e9d2..9b71e9d2 100644
--- a/meta-aarch64/recipes-devtools/php/php/0001-php-don-t-use-broken-wrapper-for-mkdir.patch
+++ b/meta-linaro/recipes-devtools/php/php/0001-php-don-t-use-broken-wrapper-for-mkdir.patch
diff --git a/meta-aarch64/recipes-devtools/php/php/acinclude-xml2-config.patch b/meta-linaro/recipes-devtools/php/php/acinclude-xml2-config.patch
index bf519d29..bf519d29 100644
--- a/meta-aarch64/recipes-devtools/php/php/acinclude-xml2-config.patch
+++ b/meta-linaro/recipes-devtools/php/php/acinclude-xml2-config.patch
diff --git a/meta-aarch64/recipes-devtools/php/php/fix-fpm-cross-compile.patch b/meta-linaro/recipes-devtools/php/php/fix-fpm-cross-compile.patch
index b009347a..b009347a 100644
--- a/meta-aarch64/recipes-devtools/php/php/fix-fpm-cross-compile.patch
+++ b/meta-linaro/recipes-devtools/php/php/fix-fpm-cross-compile.patch
diff --git a/meta-aarch64/recipes-devtools/php/php/iconv.patch b/meta-linaro/recipes-devtools/php/php/iconv.patch
index f3d2a16b..f3d2a16b 100644
--- a/meta-aarch64/recipes-devtools/php/php/iconv.patch
+++ b/meta-linaro/recipes-devtools/php/php/iconv.patch
diff --git a/meta-aarch64/recipes-devtools/php/php/imap-fix-autofoo.patch b/meta-linaro/recipes-devtools/php/php/imap-fix-autofoo.patch
index 3695b7bc..3695b7bc 100644
--- a/meta-aarch64/recipes-devtools/php/php/imap-fix-autofoo.patch
+++ b/meta-linaro/recipes-devtools/php/php/imap-fix-autofoo.patch
diff --git a/meta-aarch64/recipes-devtools/php/php/pear-makefile.patch b/meta-linaro/recipes-devtools/php/php/pear-makefile.patch
index 1928b989..1928b989 100644
--- a/meta-aarch64/recipes-devtools/php/php/pear-makefile.patch
+++ b/meta-linaro/recipes-devtools/php/php/pear-makefile.patch
diff --git a/meta-aarch64/recipes-devtools/php/php/phar-makefile.patch b/meta-linaro/recipes-devtools/php/php/phar-makefile.patch
index 6fde2512..6fde2512 100644
--- a/meta-aarch64/recipes-devtools/php/php/phar-makefile.patch
+++ b/meta-linaro/recipes-devtools/php/php/phar-makefile.patch
diff --git a/meta-aarch64/recipes-devtools/php/php/php-fpm-apache.conf b/meta-linaro/recipes-devtools/php/php/php-fpm-apache.conf
index 77cdd82a..77cdd82a 100644
--- a/meta-aarch64/recipes-devtools/php/php/php-fpm-apache.conf
+++ b/meta-linaro/recipes-devtools/php/php/php-fpm-apache.conf
diff --git a/meta-aarch64/recipes-devtools/php/php/php-fpm.conf b/meta-linaro/recipes-devtools/php/php/php-fpm.conf
index 21e3dfb5..21e3dfb5 100644
--- a/meta-aarch64/recipes-devtools/php/php/php-fpm.conf
+++ b/meta-linaro/recipes-devtools/php/php/php-fpm.conf
diff --git a/meta-linaro/recipes-devtools/php/php/php_exec_native.patch b/meta-linaro/recipes-devtools/php/php/php_exec_native.patch
new file mode 100644
index 00000000..31be1b70
--- /dev/null
+++ b/meta-linaro/recipes-devtools/php/php/php_exec_native.patch
@@ -0,0 +1,19 @@
+---
+ 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"
+   PHP_SUBST(PHP_EXECUTABLE)
+ 
+   dnl Expose to Makefile
+   PHP_SUBST(SAPI_CLI_PATH)
+   PHP_SUBST(BUILD_CLI)
diff --git a/meta-aarch64/recipes-devtools/php/php_5.3.19.bb b/meta-linaro/recipes-devtools/php/php_5.4.14.bb
index 8204104b..4e0efb1e 100644
--- a/meta-aarch64/recipes-devtools/php/php_5.3.19.bb
+++ b/meta-linaro/recipes-devtools/php/php_5.4.14.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cb564efdf78cce8ea6e4b5a4f7c05d97"
 PR = "${INC_PR}.0"
 
 SRC_URI += "file://acinclude-xml2-config.patch \
-            file://php-m4-divert.patch \
             file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch"
 
 SRC_URI_append_pn-php += "file://iconv.patch \
@@ -16,7 +15,7 @@ SRC_URI_append_pn-php += "file://iconv.patch \
             file://fix-fpm-cross-compile.patch \
             file://php-fpm.conf \
             file://php-fpm-apache.conf \
-            "
+"
 
-SRC_URI[md5sum] = "e1d2a3ec7849d4b3032bd1abf1916aa4"
-SRC_URI[sha256sum] = "814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6"
+SRC_URI[md5sum] = "cfdc044be2c582991a1fe0967898fa38"
+SRC_URI[sha256sum] = "5450f3843bc651eb3fb00601f0cce1930aaaf65c7c966c02fe4a46f9c81be20a"