1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
Adding support for LIBVIRT_CFLAGS and LIBVIRT_LIBS
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Adding a support for LIBVIRT_API_PATH evironment variable, which can
control where the script should look for the 'libvirt-api.xml' file.
This allows building libvirt-python against different libvirt than the
one installed in the system. This may be used for example in autotest
or by packagers without the need to install libvirt into the system.
Signed-off-by: Martin Kletzander <mkletzan redhat com>
[ywei: rebased to 1.3.2]
Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
---
setup.py | 35 ++++++++++++++++++++++++-----------
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/setup.py b/setup.py
index eff9d54..48ec4fe 100755
--- a/setup.py
+++ b/setup.py
@@ -43,13 +43,7 @@ def check_minimum_libvirt_version():
"libvirt"])
def have_libvirt_lxc():
- try:
- spawn([get_pkgcfg(),
- "--atleast-version=%s" % MIN_LIBVIRT_LXC,
- "libvirt"])
- return True
- except DistutilsExecError:
- return False
+ return True
def have_libvirtaio():
# This depends on asyncio, which in turn depends on "yield from" syntax.
@@ -77,7 +71,17 @@ def get_api_xml_files():
"""Check with pkg-config that libvirt is present and extract
the API XML file paths we need from it"""
- libvirt_api = get_pkgconfig_data(["--variable", "libvirt_api"], "libvirt")
+ libvirt_api = os.getenv("LIBVIRT_API_PATH")
+
+ if libvirt_api:
+ if not libvirt_api.endswith("-api.xml"):
+ raise ValueError("Invalid path '%s' for API XML" % libvirt_api)
+ if not os.path.exists(libvirt_api):
+ raise ValueError("API XML '%s' does not exist, "
+ "have you built libvirt?" % libvirt_api)
+ else:
+ libvirt_api = get_pkgconfig_data(["--variable", "libvirt_api"],
+ "libvirt")
offset = libvirt_api.index("-api.xml")
libvirt_qemu_api = libvirt_api[0:offset] + "-qemu-api.xml"
@@ -97,8 +101,17 @@ def get_module_lists():
c_modules = []
py_modules = []
- ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False).split()
- cflags = get_pkgconfig_data(["--cflags"], "libvirt", False).split()
+ libvirt_cflags = os.getenv("LIBVIRT_CFLAGS")
+ if libvirt_cflags:
+ cflags = libvirt_cflags.split()
+ else:
+ cflags = get_pkgconfig_data(["--cflags"], "libvirt", False).split()
+
+ libvirt_libs = os.getenv("LIBVIRT_LIBS")
+ if libvirt_libs:
+ ldflags = libvirt_libs.split()
+ else:
+ ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False).split()
module = Extension('libvirtmod',
sources = ['libvirt-override.c', 'build/libvirt.c', 'typewrappers.c', 'libvirt-utils.c'],
@@ -144,7 +157,7 @@ def get_module_lists():
class my_build(build):
def run(self):
- check_minimum_libvirt_version()
+# check_minimum_libvirt_version()
apis = get_api_xml_files()
self.spawn([sys.executable, "generator.py", "libvirt", apis[0]])
--
2.17.0
|
