diff options
| author | Gianni Tedesco <gianni.tedesco@citrix.com> | 2010-09-23 19:03:52 +0100 |
|---|---|---|
| committer | Gianni Tedesco <gianni.tedesco@citrix.com> | 2010-09-23 19:03:52 +0100 |
| commit | ce675adf0da0c129d4818518218242e929d29a4a (patch) | |
| tree | 0ed1b33a7f75ca567799362f60b5ce4c86b1d41b /tools/python/setup.py | |
| parent | a39b5bc64ba246b851be97c07514a76e34689d4b (diff) | |
| download | xen-ce675adf0da0c129d4818518218242e929d29a4a.tar.gz xen-ce675adf0da0c129d4818518218242e929d29a4a.tar.bz2 xen-ce675adf0da0c129d4818518218242e929d29a4a.zip | |
tools/python: do not link against blktap except on Linux
Link to libblktapctl in python setup only for platforms which build it.
This fixes a build breakage on NetBSD introduced in 330c4d9010da.
Signed-off-by: Gianni Tedesco <gianni.tedesco@citrix.com>
Tested-by: Christoph Egger <Christoph.Egger@amd.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/python/setup.py')
| -rw-r--r-- | tools/python/setup.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/python/setup.py b/tools/python/setup.py index fc8330e252..7e00034d95 100644 --- a/tools/python/setup.py +++ b/tools/python/setup.py @@ -14,8 +14,7 @@ include_dirs = [ XEN_ROOT + "/tools/libxc", library_dirs = [ XEN_ROOT + "/tools/libxc", XEN_ROOT + "/tools/xenstore", - XEN_ROOT + "/tools/libxl", - XEN_ROOT + "/tools/blktap2/control", + XEN_ROOT + "/tools/libxl" ] libraries = [ "xenctrl", "xenguest", "xenstore" ] @@ -23,8 +22,11 @@ libraries = [ "xenctrl", "xenguest", "xenstore" ] plat = os.uname()[0] if plat == 'Linux': uuid_libs = ["uuid"] + blktap_ctl_libs = ["blktapctl"] + library_dirs.append(XEN_ROOT + "/tools/blktap2/control") else: uuid_libs = [] + blktap_ctl_libs = [] xc = Extension("xc", extra_compile_args = extra_compile_args, @@ -96,7 +98,7 @@ xl = Extension("xl", extra_compile_args = extra_compile_args, include_dirs = include_dirs + [ "xen/lowlevel/xl" ], library_dirs = library_dirs, - libraries = libraries + ["xenlight", "blktapctl" ] + uuid_libs, + libraries = libraries + ["xenlight" ] + blktap_ctl_libs + uuid_libs, sources = [ "xen/lowlevel/xl/xl.c", "xen/lowlevel/xl/_pyxl_types.c" ]) modules = [ xc, xs, ptsname, acm, flask, xl ] |