|
|
|
|
|
|
|
|
|
|
xen-changelog
[Xen-changelog] [xen-unstable] Attached patch takes over some portabilit
# HG changeset patch
# User Stefano Stabellini <sstabellini@xxxxxxxxxxxxx>
# Date 1279643198 -3600
# Node ID e76befc7fe2dbaeadb9c09611175e84b837b995f
# Parent 9ddd7905d093051bd88f29284ac04dea365f13e6
Attached patch takes over some portability fixes from tools/console
to make libxl build on NetBSD.
blktapctl is build on Linux only. This will be another patch to finally
unbreak libxl.
Signed-off-by: Christoph Egger <Christoph.Egger@xxxxxxx>
---
tools/Rules.mk | 5 +++++
tools/libxl/Makefile | 2 +-
tools/libxl/libxl_bootloader.c | 9 ++++++++-
3 files changed, 14 insertions(+), 2 deletions(-)
diff -r 9ddd7905d093 -r e76befc7fe2d tools/Rules.mk
--- a/tools/Rules.mk Tue Jul 20 17:22:14 2010 +0100
+++ b/tools/Rules.mk Tue Jul 20 17:26:38 2010 +0100
@@ -26,8 +26,13 @@ CFLAGS_libxenstore = -I$(XEN_XENSTORE) $
CFLAGS_libxenstore = -I$(XEN_XENSTORE) $(CFLAGS_include)
LDFLAGS_libxenstore = -L$(XEN_XENSTORE) -lxenstore
+ifeq ($(CONFIG_Linux),y)
CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include
$(CFLAGS_include)
LDFLAGS_libblktapctl = -L$(XEN_BLKTAP2)/control -lblktapctl
+else
+CFLAGS_libblktapctl =
+LDFLAGS_libblktapctl =
+endif
X11_LDPATH = -L/usr/X11R6/$(LIBLEAFDIR)
diff -r 9ddd7905d093 -r e76befc7fe2d tools/libxl/Makefile
--- a/tools/libxl/Makefile Tue Jul 20 17:22:14 2010 +0100
+++ b/tools/libxl/Makefile Tue Jul 20 17:26:38 2010 +0100
@@ -15,7 +15,7 @@ CFLAGS += -I. -fPIC
CFLAGS += -I. -fPIC
CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore)
$(CFLAGS_libblktapctl)
-LIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore)
$(LDFLAGS_libblktapctl) -lutil
+LIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore)
$(LDFLAGS_libblktapctl) $(UTIL_LIBS)
LIBXL_OBJS-y = osdeps.o libxl_paths.o libxl_bootloader.o
LIBXL_OBJS = flexarray.o libxl.o libxl_dom.o libxl_exec.o libxl_xshelp.o
libxl_device.o libxl_internal.o xenguest.o libxl_utils.o $(LIBXL_OBJS-y)
diff -r 9ddd7905d093 -r e76befc7fe2d tools/libxl/libxl_bootloader.c
--- a/tools/libxl/libxl_bootloader.c Tue Jul 20 17:22:14 2010 +0100
+++ b/tools/libxl/libxl_bootloader.c Tue Jul 20 17:26:38 2010 +0100
@@ -15,9 +15,16 @@
#include "libxl_osdeps.h"
#include <string.h>
-#include <pty.h>
#include <unistd.h>
#include <fcntl.h>
+#include <termios.h>
+#if defined(__NetBSD__) || defined(__OpenBSD__)
+#include <util.h>
+#elif defined(__linux__)
+#include <pty.h>
+#elif defined(__sun__)
+#include <stropts.h>
+#endif
#include <sys/stat.h>
#include <sys/types.h>
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
<Prev in Thread] |
Current Thread |
[Next in Thread> |
- [Xen-changelog] [xen-unstable] Attached patch takes over some portability fixes from tools/console,
Xen patchbot-unstable <=
|
|
|
|
|