$NetBSD: patch-tools_Makefile,v 1.2 2019/12/18 13:37:39 bouyer Exp $

--- tools/Makefile.orig	2019-11-29 10:15:18.000000000 +0100
+++ tools/Makefile	2019-12-18 13:52:23.266439614 +0100
@@ -21,7 +21,7 @@
 SUBDIRS-y += xenstat
 SUBDIRS-$(CONFIG_Linux) += memshr 
 SUBDIRS-$(CONFIG_BLKTAP2) += blktap2
-SUBDIRS-$(CONFIG_NetBSD) += xenbackendd
+#XXX SUBDIRS-$(CONFIG_NetBSD) += xenbackendd
 SUBDIRS-y += libfsimage
 SUBDIRS-$(CONFIG_Linux) += libvchan
 
@@ -39,7 +39,7 @@
 SUBDIRS-$(CONFIG_X86) += xenpaging
 SUBDIRS-$(CONFIG_X86) += debugger/gdbsx
 SUBDIRS-$(CONFIG_X86) += debugger/kdd
-SUBDIRS-$(CONFIG_TESTS) += tests
+#XXX SUBDIRS-$(CONFIG_TESTS) += tests
 
 # These don't cross-compile
 ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
@@ -262,17 +262,18 @@
 		-L$(XEN_ROOT)/tools/libs/gnttab \
 		-L$(XEN_ROOT)/tools/libs/foreignmemory \
 		-L$(XEN_ROOT)/tools/libs/devicemodel \
-		-Wl,-rpath-link=$(XEN_ROOT)/tools/libs/toolcore \
-		-Wl,-rpath-link=$(XEN_ROOT)/tools/libs/toollog \
-		-Wl,-rpath-link=$(XEN_ROOT)/tools/libs/evtchn \
-		-Wl,-rpath-link=$(XEN_ROOT)/tools/libs/gnttab \
-		-Wl,-rpath-link=$(XEN_ROOT)/tools/libs/call \
-		-Wl,-rpath-link=$(XEN_ROOT)/tools/libs/foreignmemory \
-		-Wl,-rpath-link=$(XEN_ROOT)/tools/libs/devicemodel \
+		-Wl,-rpath-link,$(XEN_ROOT)/tools/libs/toolcore \
+		-Wl,-rpath-link,$(XEN_ROOT)/tools/libs/toollog \
+		-Wl,-rpath-link,$(XEN_ROOT)/tools/libs/evtchn \
+		-Wl,-rpath-link,$(XEN_ROOT)/tools/libs/gnttab \
+		-Wl,-rpath-link,$(XEN_ROOT)/tools/libs/call \
+		-Wl,-rpath-link,$(XEN_ROOT)/tools/libs/foreignmemory \
+		-Wl,-rpath-link,$(XEN_ROOT)/tools/libs/devicemodel \
 		$(QEMU_UPSTREAM_RPATH)" \
 		--bindir=$(LIBEXEC_BIN) \
 		--datadir=$(SHAREDIR)/qemu-xen \
 		--localstatedir=$(localstatedir) \
+		--disable-opengl \
 		--disable-kvm \
 		--disable-docs \
 		--disable-guest-agent \