Patchwork [meta-oe,1/3] php: upgrade to 5.3.19

login
register
mail settings
Submitter Eric BENARD
Date Nov. 27, 2012, 4:16 p.m.
Message ID <1354033003-31657-1-git-send-email-eric@eukrea.com>
Download mbox | patch
Permalink /patch/39715/
State Accepted, archived
Headers show

Comments

Eric BENARD - Nov. 27, 2012, 4:16 p.m.
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 meta-oe/recipes-devtools/php/php.inc         |    4 ++--
 meta-oe/recipes-devtools/php/php/iconv.patch |   26 +++++++++++++-------------
 meta-oe/recipes-devtools/php/php_5.3.19.bb   |   19 +++++++++++++++++++
 meta-oe/recipes-devtools/php/php_5.3.6.bb    |   19 -------------------
 4 files changed, 34 insertions(+), 34 deletions(-)
 create mode 100644 meta-oe/recipes-devtools/php/php_5.3.19.bb
 delete mode 100644 meta-oe/recipes-devtools/php/php_5.3.6.bb
Marcin Juszkiewicz - Nov. 28, 2012, 12:12 p.m.
For whole patchset as it works great on AArch64:

Acked-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
ml@communistcode.co.uk - Nov. 28, 2012, 2:18 p.m.
On 27/11/12 16:16, Eric Bénard wrote:
> [snip]

Was there a patch to bring this over to meta-webserver too?
Eric BENARD - Nov. 28, 2012, 6:23 p.m.
Le Wed, 28 Nov 2012 14:18:47 +0000,
Jack Mitchell <ml@communistcode.co.uk> a écrit :

> On 27/11/12 16:16, Eric Bénard wrote:
> > [snip]
> 
> Was there a patch to bring this over to meta-webserver too?
> 
that's WIP based on a previous work by Marcin, I expect to be able to
test that by the begining of next week.

PHP can be used as php-cli so not in a webserver context so maybe the
best way to handle that would be to have php in meta-oe to generate
php-cli and a bbappend in meta-webserver to general php-cgi, php-fpm
and modphp when meta-webserver is enabled.

Eric

Patch

diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
index 87eb4b1..03b7b40 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -1,13 +1,13 @@ 
 DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI."
 HOMEPAGE = "http://www.php.net"
 SECTION = "console/network"
-LICENSE = "PHP"
+LICENSE = "PHP-3.0"
 BBCLASSEXTEND = "native"
 DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \
            libc-client openssl"
 DEPENDS_virtclass-native = "zlib-native libxml2-native"
 
-INC_PR = "r2"
+INC_PR = "r0"
 
 SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2"
 
diff --git a/meta-oe/recipes-devtools/php/php/iconv.patch b/meta-oe/recipes-devtools/php/php/iconv.patch
index 66b39cc..f3d2a16 100644
--- a/meta-oe/recipes-devtools/php/php/iconv.patch
+++ b/meta-oe/recipes-devtools/php/php/iconv.patch
@@ -1,21 +1,21 @@ 
-Index: php-5.2.13/acinclude.m4
-===================================================================
---- php-5.2.13.orig/acinclude.m4
-+++ php-5.2.13/acinclude.m4
-@@ -2430,7 +2430,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
-   dnl
+diff --git a/acinclude.m4 b/acinclude.m4
+index 4c28b80..d6491a1 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -2439,7 +2439,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
    dnl Check libc first if no path is provided in --with-iconv
    dnl
+ 
 -  if test "$PHP_ICONV" = "yes"; then
 +  dnl must check against no, not against yes as PHP_ICONV can also include a path, which implies yes
 +  if test "$PHP_ICONV" != "no"; then
-     AC_CHECK_FUNC(iconv, [
-       found_iconv=yes
-     ],[
-Index: php-5.2.13/ext/iconv/config.m4
-===================================================================
---- php-5.2.13.orig/ext/iconv/config.m4
-+++ php-5.2.13/ext/iconv/config.m4
+     dnl Reset LIBS temporarily as it may have already been included
+     dnl -liconv in.
+     LIBS_save="$LIBS"
+diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
+index d673b0a..1fbef13 100644
+--- a/ext/iconv/config.m4
++++ b/ext/iconv/config.m4
 @@ -15,7 +15,7 @@ if test "$PHP_ICONV" != "no"; then
  
    if test "$iconv_avail" != "no"; then
diff --git a/meta-oe/recipes-devtools/php/php_5.3.19.bb b/meta-oe/recipes-devtools/php/php_5.3.19.bb
new file mode 100644
index 0000000..e96b760
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php_5.3.19.bb
@@ -0,0 +1,19 @@ 
+require php.inc
+
+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 \
+            file://imap-fix-autofoo.patch \
+            file://pear-makefile.patch \
+            file://phar-makefile.patch \
+            file://php_exec_native.patch \
+            "
+
+SRC_URI[md5sum] = "e1d2a3ec7849d4b3032bd1abf1916aa4"
+SRC_URI[sha256sum] = "814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6"
diff --git a/meta-oe/recipes-devtools/php/php_5.3.6.bb b/meta-oe/recipes-devtools/php/php_5.3.6.bb
deleted file mode 100644
index 9524bd9..0000000
--- a/meta-oe/recipes-devtools/php/php_5.3.6.bb
+++ /dev/null
@@ -1,19 +0,0 @@ 
-require php.inc
-
-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 \
-            file://imap-fix-autofoo.patch \
-            file://pear-makefile.patch \
-            file://phar-makefile.patch \
-            file://php_exec_native.patch \
-            "
-
-SRC_URI[md5sum] = "2286f5a82a6e8397955a0025c1c2ad98"
-SRC_URI[sha256sum] = "30ae880f22e3ee93eccc9b80e3c58b0d6364d139bb4366dcc27f2fab658d3198"