aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch
diff options
context:
space:
mode:
authorKoen Kooi <koen.kooi@linaro.org>2014-10-06 11:55:01 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-10-10 12:47:34 +0200
commit4deb828fff69b2c04837b122676aa9d4f56c1b9e (patch)
tree146fbc0b1347fe646109e59ad853d75a76530b69 /meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch
parent26043cbe2d9add3ab1f6464e647d04f0e077aede (diff)
downloadmeta-openembedded-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/0001-acinclude-use-pkgconfig-for-libxml2-config.patch')
-rw-r--r--meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch b/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch
index 823007e687..51a5e43b60 100644
--- a/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch
+++ b/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch
@@ -1,7 +1,7 @@
-From 0ff5d4adc9f5950d66738272b3ba88ef74f69117 Mon Sep 17 00:00:00 2001
+From 003c9feaae6ed5c173edcea51193e49bc94ac39a Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen.kooi@linaro.org>
Date: Tue, 17 Jun 2014 09:53:00 +0200
-Subject: [PATCH] acinclude: use pkgconfig for libxml2 config
+Subject: [PATCH 3/8] acinclude: use pkgconfig for libxml2 config
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Upstream-Status: pending
@@ -10,10 +10,10 @@ Upstream-Status: pending
1 file changed, 23 insertions(+), 40 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
-index 9c7a305..211dbd3 100644
+index 206fcbf..a6c0d84 100644
--- a/acinclude.m4
+++ b/acinclude.m4
-@@ -2529,48 +2529,31 @@ dnl
+@@ -2530,48 +2530,31 @@ dnl
dnl Common setup macro for libxml
dnl
AC_DEFUN([PHP_SETUP_LIBXML], [