diff options
| author |   Koen Kooi <koen.kooi@linaro.org> | 2014-10-06 11:55:01 +0200 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-10 12:47:34 +0200 |
| commit | 4deb828fff69b2c04837b122676aa9d4f56c1b9e (patch) | |
| tree | 146fbc0b1347fe646109e59ad853d75a76530b69 /meta-oe/recipes-devtools/php/php/iconv.patch | |
| parent | 26043cbe2d9add3ab1f6464e647d04f0e077aede (diff) | |
| download | meta-openembedded-contrib-4deb828fff69b2c04837b122676aa9d4f56c1b9e.tar.gz | |
php: update to 5.4.33
One patch was a backport and can be dropped, add Upstream-status to the others.
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/php/php/iconv.patch')
| -rw-r--r-- | meta-oe/recipes-devtools/php/php/iconv.patch | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/meta-oe/recipes-devtools/php/php/iconv.patch b/meta-oe/recipes-devtools/php/php/iconv.patch index f3d2a16bbf..255fbb062c 100644 --- a/meta-oe/recipes-devtools/php/php/iconv.patch +++ b/meta-oe/recipes-devtools/php/php/iconv.patch @@ -1,8 +1,10 @@ +Upstream-status: Unknown + diff --git a/acinclude.m4 b/acinclude.m4 -index 4c28b80..d6491a1 100644 +index a6c0d84..df11abd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 -@@ -2439,7 +2439,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [ +@@ -2452,7 +2452,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [ dnl Check libc first if no path is provided in --with-iconv dnl @@ -25,3 +27,6 @@ index d673b0a..1fbef13 100644 if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then PHP_ICONV_PREFIX="$i" break +-- +1.9.3 + |