mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-15 16:07:26 +00:00
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>
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user