Re: [Xen-devel] tools: build error

[Gianni Tedesco <gianni.tedesco@xxxxxxxxxx>]

On Wed, 2010-09-22 at 13:59 +0100, Christoph Egger wrote:
> Hi!
> 
> Changeset 22167:330c4d9010da breaks the build.
> 
> It adds blktapctl to link against in setup.py which isn't build
> on NetBSD.

Oops, Following ought to fix it:

----8<------------------------------------------------------
Link to libblktapctl in python setup only for platforms which build it

Signed-off-by: Gianni Tedesco <gianni.tedesco@xxxxxxxxxx>

diff -r 36420e35c65a tools/python/setup.py
--- a/tools/python/setup.py     Wed Sep 22 16:57:12 2010 +0100
+++ b/tools/python/setup.py     Wed Sep 22 18:25:22 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 @@ libraries = [ "xenctrl", "xenguest", "xe
 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-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel