summaryrefslogtreecommitdiffstats
path: root/recipes-extended/libvirt/libvirt/0001-to-fix-build-error.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-extended/libvirt/libvirt/0001-to-fix-build-error.patch')
-rw-r--r--recipes-extended/libvirt/libvirt/0001-to-fix-build-error.patch22
1 files changed, 10 insertions, 12 deletions
diff --git a/recipes-extended/libvirt/libvirt/0001-to-fix-build-error.patch b/recipes-extended/libvirt/libvirt/0001-to-fix-build-error.patch
index c920139e..33231960 100644
--- a/recipes-extended/libvirt/libvirt/0001-to-fix-build-error.patch
+++ b/recipes-extended/libvirt/libvirt/0001-to-fix-build-error.patch
@@ -1,4 +1,4 @@
1From 8353dc1e642011199c3b3ba057d51d8768e4cd54 Mon Sep 17 00:00:00 2001 1From 7cf1d66c4b01c40b45b8a38370c7ffee46dfb10a Mon Sep 17 00:00:00 2001
2From: Lei Maohui <leimaohui@cn.fujitsu.com> 2From: Lei Maohui <leimaohui@cn.fujitsu.com>
3Date: Fri, 31 Jul 2015 03:17:07 +0900 3Date: Fri, 31 Jul 2015 03:17:07 +0900
4Subject: [PATCH] to fix build error 4Subject: [PATCH] to fix build error
@@ -17,26 +17,27 @@ Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
17Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com> 17Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
18[MA: rebase to v4.3.0] 18[MA: rebase to v4.3.0]
19Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> 19Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
20
20--- 21---
21 docs/Makefile.am | 5 ++--- 22 docs/Makefile.am | 5 ++---
22 1 file changed, 2 insertions(+), 3 deletions(-) 23 1 file changed, 2 insertions(+), 3 deletions(-)
23 24
24diff --git a/docs/Makefile.am b/docs/Makefile.am 25diff --git a/docs/Makefile.am b/docs/Makefile.am
25index 9620587..060a82b 100644 26index 61862c4..c259535 100644
26--- a/docs/Makefile.am 27--- a/docs/Makefile.am
27+++ b/docs/Makefile.am 28+++ b/docs/Makefile.am
28@@ -183,7 +183,7 @@ EXTRA_DIST= \ 29@@ -360,7 +360,7 @@ EXTRA_DIST= \
29 hvsupport.pl \ 30 aclperms.htmlinc \
30 $(schema_DATA) 31 $(schema_DATA)
31 32
32-acl_generated = aclperms.htmlinc 33-acl_generated = aclperms.htmlinc
33+acl.html:: $(srcdir)/aclperms.htmlinc 34+acl.html:: $(srcdir)/aclperms.htmlinc
34 35
35 $(srcdir)/aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \ 36 aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \
36 $(srcdir)/genaclperms.pl Makefile.am 37 $(top_srcdir)/scripts/genaclperms.py Makefile.am
37@@ -247,8 +247,7 @@ MAINTAINERCLEANFILES += \ 38@@ -426,8 +426,7 @@ manpages/%.html.in: manpages/%.rst
38 %.png: %.fig 39 $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \
39 convert -rotate 90 $< $@ 40 $(RST2HTML) --strict $< > $@ || { rm $@ && exit 1; }
40 41
41-%.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \ 42-%.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \
42- $(acl_generated) 43- $(acl_generated)
@@ -44,6 +45,3 @@ index 9620587..060a82b 100644
44 $(AM_V_GEN)name=`echo $@ | sed -e 's/.tmp//'`; \ 45 $(AM_V_GEN)name=`echo $@ | sed -e 's/.tmp//'`; \
45 dir=`dirname $@` ; \ 46 dir=`dirname $@` ; \
46 if test "$$dir" = "."; \ 47 if test "$$dir" = "."; \
47--
481.9.1
49