[Xen-changelog] [xen-unstable] tools/python: do not link against blktap except on Linux

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Gianni Tedesco <gianni.tedesco@xxxxxxxxxx>
# Date 1285265032 -3600
# Node ID 07c1d958eee0ba050993c742dc1640c03c8d31f0
# Parent  4d95192b2fc8a0cfe88adee994c1f5117eefd86e
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@xxxxxxxxxx>
Tested-by: Christoph Egger <Christoph.Egger@xxxxxxx>
Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 tools/python/setup.py |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff -r 4d95192b2fc8 -r 07c1d958eee0 tools/python/setup.py
--- a/tools/python/setup.py     Thu Sep 23 19:01:37 2010 +0100
+++ b/tools/python/setup.py     Thu Sep 23 19:03:52 2010 +0100
@@ -14,8 +14,7 @@ include_dirs = [ XEN_ROOT + "/tools/libx
 
 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 @@ plat = os.uname()[0]
 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 ]

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog