diff options
| author |   Eric BENARD <eric@eukrea.com> | 2012-11-27 16:16:41 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-12-04 10:43:08 +0100 |
| commit | f8a7fc5574dc039078a064742c9f9d2b9a759489 (patch) | |
| tree | ac52e7f8fa821965b0202301d075a412b2f5358a | |
| parent | 07e9ca6888c728c4c9d3d3631b901c603d247beb (diff) | |
| download | meta-openembedded-f8a7fc5574dc039078a064742c9f9d2b9a759489.tar.gz | |
php: upgrade to 5.3.19
Signed-off-by: Eric Bénard <eric@eukrea.com>
Acked-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
| -rw-r--r-- | meta-oe/recipes-devtools/php/php.inc | 4 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/php/php/iconv.patch | 26 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/php/php_5.3.19.bb (renamed from meta-oe/recipes-devtools/php/php_5.3.6.bb) | 4 |
3 files changed, 17 insertions, 17 deletions
diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc index 87eb4b16a6..03b7b40b36 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 66b39cc560..f3d2a16bbf 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.6.bb b/meta-oe/recipes-devtools/php/php_5.3.19.bb index 9524bd9ab9..e96b760789 100644 --- a/meta-oe/recipes-devtools/php/php_5.3.6.bb +++ b/meta-oe/recipes-devtools/php/php_5.3.19.bb @@ -15,5 +15,5 @@ SRC_URI_append_pn-php += "file://iconv.patch \ file://php_exec_native.patch \ " -SRC_URI[md5sum] = "2286f5a82a6e8397955a0025c1c2ad98" -SRC_URI[sha256sum] = "30ae880f22e3ee93eccc9b80e3c58b0d6364d139bb4366dcc27f2fab658d3198" +SRC_URI[md5sum] = "e1d2a3ec7849d4b3032bd1abf1916aa4" +SRC_URI[sha256sum] = "814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6" |