diff -r 45d657ffba3f -r bfe60252cca5 config/Linux.mk --- a/config/Linux.mk +++ b/config/Linux.mk @@ -6,3 +6,5 @@ KERNELS ?= XKERNELS := $(foreach kernel, $(KERNELS), \ $(patsubst buildconfigs/mk.%,%, \ $(wildcard buildconfigs/mk.$(kernel))) ) + +LIBDL = -ldl diff -r 45d657ffba3f -r bfe60252cca5 config/NetBSD.mk --- a/config/NetBSD.mk +++ b/config/NetBSD.mk @@ -7,6 +7,8 @@ LIBLEAFDIR_x86_64 = lib LIBEXEC = $(PREFIX)/libexec PRIVATE_BINDIR = $(BINDIR) +LIBDL = + ifeq ($(PREFIX),/usr) XEN_LOCK_DIR = /var/lib else diff -r 45d657ffba3f -r bfe60252cca5 tools/libxc/Makefile --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -158,7 +158,7 @@ libxenctrl.so.$(MAJOR): libxenctrl.so.$( ln -sf $< $@ libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) -ldl $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(LIBDL) $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS) # libxenguest diff -r 45d657ffba3f -r bfe60252cca5 tools/libxc/xc_netbsd.c --- a/tools/libxc/xc_netbsd.c +++ b/tools/libxc/xc_netbsd.c @@ -52,7 +52,7 @@ static xc_osdep_handle netbsd_privcmd_op goto error; } - return (xc_osinteface_handle)fd; + return (xc_osdep_handle)fd; error: saved_errno = errno; @@ -182,7 +182,7 @@ static struct xc_osdep_ops netbsd_privcm .close = &netbsd_privcmd_close, .u.privcmd = { - .hypercall = &netbsd_privcmd_hypercall; + .hypercall = &netbsd_privcmd_hypercall, .map_foreign_batch = &netbsd_privcmd_map_foreign_batch, .map_foreign_bulk = &xc_map_foreign_bulk_compat,