1 files changed, 22 insertions, 25 deletions
diff --git a/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch b/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch
index d0a58041f..1ceacd8c4 100644
--- a/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch
+++ b/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch
@@ -9,31 +9,28 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com>
 configure.ac | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
-diff --git a/configure.ac b/configure.ac
+Index: collectd-5.7.1/configure.ac
-index 923498e..7206095 100644
+===================================================================
--- a/configure.ac
+--- collectd-5.7.1.orig/configure.ac
-+++ b/configure.ac
+++ collectd-5.7.1/configure.ac
-@@ -4778,12 +4778,14 @@ then
+@@ -5556,12 +5556,14 @@ else
-                with_libxml2="no (pkg-config doesn't know libxml-2.0)"
+        with_libxml2="no (pkg-config doesn't know libxml-2.0)"
-        fi
+ fi
 
-       $PKG_CONFIG --exists libvirt 2>/dev/null
+-$PKG_CONFIG --exists libvirt 2>/dev/null
-       if test "$?" = "0"
+-if test "$?" = "0"
-       then
+-then
-               with_libvirt="yes"
+-       with_libvirt="yes"
-       else
+-else
-               with_libvirt="no (pkg-config doesn't know libvirt)"
+-       with_libvirt="no (pkg-config doesn't know libvirt)"
-+       if test "x$enable_libvirt" = "xyes"; then
+if test "x$enable_libvirt" = "xyes"; then
-+               $PKG_CONFIG --exists libvirt 2>/dev/null
+       $PKG_CONFIG --exists libvirt 2>/dev/null
-+               if test "$?" = "0"
+       if test "$?" = "0"
-+               then
+       then
-+                       with_libvirt="yes"
+               with_libvirt="yes"
-+               else
+       else
-+                       with_libvirt="no (pkg-config doesn't know libvirt)"
+               with_libvirt="no (pkg-config doesn't know libvirt)"
-+               fi
+       fi
-        fi
 fi
 if test "x$with_libxml2" = "xyes"
-- 
+ then
-1.9.1

diff --git a/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch b/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch index d0a58041f..1ceacd8c4 100644 --- a/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch +++ b/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch
@@ -9,31 +9,28 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com>
9	configure.ac \| 14 ++++++++------	9	configure.ac \| 14 ++++++++------
10	1 file changed, 8 insertions(+), 6 deletions(-)	10	1 file changed, 8 insertions(+), 6 deletions(-)
11		11
12	diff --git a/configure.ac b/configure.ac	12	Index: collectd-5.7.1/configure.ac
13	index 923498e..7206095 100644	13	===================================================================
14	--- a/configure.ac	14	--- collectd-5.7.1.orig/configure.ac
15	+++ b/configure.ac	15	+++ collectd-5.7.1/configure.ac
16	@@ -4778,12 +4778,14 @@ then	16	@@ -5556,12 +5556,14 @@ else
17	with_libxml2="no (pkg-config doesn't know libxml-2.0)"	17	with_libxml2="no (pkg-config doesn't know libxml-2.0)"
18	fi	18	fi
19		19
20	- $PKG_CONFIG --exists libvirt 2>/dev/null	20	-$PKG_CONFIG --exists libvirt 2>/dev/null
21	- if test "$?" = "0"	21	-if test "$?" = "0"
22	- then	22	-then
23	- with_libvirt="yes"	23	- with_libvirt="yes"
24	- else	24	-else
25	- with_libvirt="no (pkg-config doesn't know libvirt)"	25	- with_libvirt="no (pkg-config doesn't know libvirt)"
26	+ if test "x$enable_libvirt" = "xyes"; then	26	+if test "x$enable_libvirt" = "xyes"; then
27	+ $PKG_CONFIG --exists libvirt 2>/dev/null	27	+ $PKG_CONFIG --exists libvirt 2>/dev/null
28	+ if test "$?" = "0"	28	+ if test "$?" = "0"
29	+ then	29	+ then
30	+ with_libvirt="yes"	30	+ with_libvirt="yes"
31	+ else	31	+ else
32	+ with_libvirt="no (pkg-config doesn't know libvirt)"	32	+ with_libvirt="no (pkg-config doesn't know libvirt)"
33	+ fi	33	+ fi
34	fi
35	fi	34	fi
36	if test "x$with_libxml2" = "xyes"	35	if test "x$with_libxml2" = "xyes"
37	--	36	then
38	1.9.1
39