summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorEric BENARD <eric@eukrea.com>2012-11-27 16:16:41 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-12-04 10:43:08 +0100
commitf8a7fc5574dc039078a064742c9f9d2b9a759489 (patch)
treeac52e7f8fa821965b0202301d075a412b2f5358a /meta-oe
parent07e9ca6888c728c4c9d3d3631b901c603d247beb (diff)
downloadmeta-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>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-devtools/php/php.inc4
-rw-r--r--meta-oe/recipes-devtools/php/php/iconv.patch26
-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 87eb4b16a..03b7b40b3 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -1,13 +1,13 @@
1DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI." 1DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI."
2HOMEPAGE = "http://www.php.net" 2HOMEPAGE = "http://www.php.net"
3SECTION = "console/network" 3SECTION = "console/network"
4LICENSE = "PHP" 4LICENSE = "PHP-3.0"
5BBCLASSEXTEND = "native" 5BBCLASSEXTEND = "native"
6DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \ 6DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \
7 libc-client openssl" 7 libc-client openssl"
8DEPENDS_virtclass-native = "zlib-native libxml2-native" 8DEPENDS_virtclass-native = "zlib-native libxml2-native"
9 9
10INC_PR = "r2" 10INC_PR = "r0"
11 11
12SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2" 12SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2"
13 13
diff --git a/meta-oe/recipes-devtools/php/php/iconv.patch b/meta-oe/recipes-devtools/php/php/iconv.patch
index 66b39cc56..f3d2a16bb 100644
--- a/meta-oe/recipes-devtools/php/php/iconv.patch
+++ b/meta-oe/recipes-devtools/php/php/iconv.patch
@@ -1,21 +1,21 @@
1Index: php-5.2.13/acinclude.m4 1diff --git a/acinclude.m4 b/acinclude.m4
2=================================================================== 2index 4c28b80..d6491a1 100644
3--- php-5.2.13.orig/acinclude.m4 3--- a/acinclude.m4
4+++ php-5.2.13/acinclude.m4 4+++ b/acinclude.m4
5@@ -2430,7 +2430,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [ 5@@ -2439,7 +2439,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
6 dnl
7 dnl Check libc first if no path is provided in --with-iconv 6 dnl Check libc first if no path is provided in --with-iconv
8 dnl 7 dnl
8
9- if test "$PHP_ICONV" = "yes"; then 9- if test "$PHP_ICONV" = "yes"; then
10+ dnl must check against no, not against yes as PHP_ICONV can also include a path, which implies yes 10+ dnl must check against no, not against yes as PHP_ICONV can also include a path, which implies yes
11+ if test "$PHP_ICONV" != "no"; then 11+ if test "$PHP_ICONV" != "no"; then
12 AC_CHECK_FUNC(iconv, [ 12 dnl Reset LIBS temporarily as it may have already been included
13 found_iconv=yes 13 dnl -liconv in.
14 ],[ 14 LIBS_save="$LIBS"
15Index: php-5.2.13/ext/iconv/config.m4 15diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
16=================================================================== 16index d673b0a..1fbef13 100644
17--- php-5.2.13.orig/ext/iconv/config.m4 17--- a/ext/iconv/config.m4
18+++ php-5.2.13/ext/iconv/config.m4 18+++ b/ext/iconv/config.m4
19@@ -15,7 +15,7 @@ if test "$PHP_ICONV" != "no"; then 19@@ -15,7 +15,7 @@ if test "$PHP_ICONV" != "no"; then
20 20
21 if test "$iconv_avail" != "no"; then 21 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 9524bd9ab..e96b76078 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 \
15 file://php_exec_native.patch \ 15 file://php_exec_native.patch \
16 " 16 "
17 17
18SRC_URI[md5sum] = "2286f5a82a6e8397955a0025c1c2ad98" 18SRC_URI[md5sum] = "e1d2a3ec7849d4b3032bd1abf1916aa4"
19SRC_URI[sha256sum] = "30ae880f22e3ee93eccc9b80e3c58b0d6364d139bb4366dcc27f2fab658d3198" 19SRC_URI[sha256sum] = "814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6"