[Xen-devel] tools/libxl: fix compilation and link errors on NetBSD

[Christoph Egger <chegger@xxxxxxxxx>]

commit cad172d7b88bd443c81d865051297875ce2551bc
Author: Christoph Egger <chegger@xxxxxxxxx>
Date:   Thu Feb 7 14:42:29 2013 +0000

    tools/libxl: fix compilation and link errors on NetBSD
    
    - Fix testidl link error that libyajl is not found
    - Make linking of xl and testidl consistent
    - fix error: array subscript has type 'char'
    
    Signed-off-by: Christoph Egger <chegger@xxxxxxxxx>
    Reviewed-by: Matthew Wilson <msw@xxxxxxxxx>

diff --git a/tools/Rules.mk b/tools/Rules.mk
index 3f03a31..4067955 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -56,7 +56,7 @@ SHLIB_libblktapctl  =
 endif
 
 CFLAGS_libxenlight = -I$(XEN_XENLIGHT) $(CFLAGS_libxenctrl) 
$(CFLAGS_xeninclude)
-LDLIBS_libxenlight = $(XEN_XENLIGHT)/libxenlight.so $(SHLIB_libxenctrl) 
$(SHLIB_libxenstore) $(SHLIB_libblktapctl)
+LDLIBS_libxenlight = $(XEN_XENLIGHT)/libxenlight.so $(APPEND_LDFLAGS) -lyajl 
$(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(SHLIB_libblktapctl)
 SHLIB_libxenlight  = -Wl,-rpath-link=$(XEN_XENLIGHT)
 
 CFLAGS += -D__XEN_TOOLS__
diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index cf214bb..c65c11e 100644
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -189,7 +189,7 @@ libxlutil.a: $(LIBXLU_OBJS)
        $(AR) rcs libxlutil.a $^
 
 xl: $(XL_OBJS) libxlutil.so libxenlight.so
-       $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) 
$(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS)
+       $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) 
$(LDLIBS_libxenctrl) $(APPEND_LDFLAGS)
 
 libxl-save-helper: $(SAVE_HELPER_OBJS) libxenlight.so
        $(CC) $(LDFLAGS) -o $@ $(SAVE_HELPER_OBJS) $(LDLIBS_libxenctrl) 
$(LDLIBS_libxenguest) $(APPEND_LDFLAGS)
diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c
index 35da71c..0c039b1 100644
--- a/tools/libxl/libxl_utils.c
+++ b/tools/libxl/libxl_utils.c
@@ -95,7 +95,7 @@ int libxl_domain_qualifier_to_domid(libxl_ctx *ctx, const 
char *name,
 {
     int i, rv;
     for (i=0; name[i]; i++) {
-        if (!isdigit(name[i])) {
+        if (!isdigit((unigned char)name[i])) {
             goto nondigit_found;
         }
     }

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel