tools/python: do not link against blktap except on Linux
authorGianni Tedesco <gianni.tedesco@citrix.com>
Thu, 23 Sep 2010 18:03:52 +0000 (19:03 +0100)
committerGianni Tedesco <gianni.tedesco@citrix.com>
Thu, 23 Sep 2010 18:03:52 +0000 (19:03 +0100)
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>
tools/python/setup.py

index fc8330e252a32cb03d34e4450479dd827ea0e446..7e00034d95b8a3c16f2044e3f24044cbb2b86702 100644 (file)
@@ -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 ]