summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbouyer <bouyer@pkgsrc.org>2019-12-18 13:37:39 +0000
committerbouyer <bouyer@pkgsrc.org>2019-12-18 13:37:39 +0000
commit4004679507d81ba956c9e7db4bd9a8713a0de79e (patch)
tree521d6ebe01957fe75cc505bbc8df8f315044f6b5
parent4f39ce33ca6e932096c2c3310167958c27968d55 (diff)
downloadpkgsrc-4004679507d81ba956c9e7db4bd9a8713a0de79e.tar.gz
Disable opengl for qemu-xen, to workaround an issue with epoxy and newer
x11-links http://mail-index.netbsd.org/tech-pkg/2019/11/02/msg022228.html
-rw-r--r--sysutils/xentools411/distinfo4
-rw-r--r--sysutils/xentools411/patches/patch-tools_Makefile13
2 files changed, 11 insertions, 6 deletions
diff --git a/sysutils/xentools411/distinfo b/sysutils/xentools411/distinfo
index 6bd9097539e..d81d16866ff 100644
--- a/sysutils/xentools411/distinfo
+++ b/sysutils/xentools411/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2019/12/13 13:44:21 bouyer Exp $
+$NetBSD: distinfo,v 1.9 2019/12/18 13:37:39 bouyer Exp $
SHA1 (xen411/ipxe-git-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d.tar.gz) = 272b8c904dc0127690eca2c5c20c67479e40da34
RMD160 (xen411/ipxe-git-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d.tar.gz) = cfcb4a314c15da19b36132b27126f3bd9699d0e5
@@ -26,7 +26,7 @@ SHA1 (patch-extras_mini-os_include_time.h) = ab3b0794bf892ce6a036aa889c6852d65b5
SHA1 (patch-extras_mini-os_lib_sys.c) = f6514ad743a206c0e81dcccd2586e8fe65bfd1b9
SHA1 (patch-extras_mini-os_lock.c) = e28753793dee483c1ffad8ea8ed2706353046b50
SHA1 (patch-m4_paths.m4) = 19250964fd808cad30a2aca3de011650a2788251
-SHA1 (patch-tools_Makefile) = a4f873797469190d58cc27bbb55d1afb151a2ff8
+SHA1 (patch-tools_Makefile) = b1ac601abfbef67dacc1a6d74da52e803c8e115b
SHA1 (patch-tools_Rules.mk) = c15994d1e0c089674fdea874b56950a07be3deb5
SHA1 (patch-tools_configure) = aa0838a1eadf70f5ed99748926234c0376989ff5
SHA1 (patch-tools_console_daemon_utils.c) = 1c954e1edadad2607f7b87eaf2d6285be7f968ff
diff --git a/sysutils/xentools411/patches/patch-tools_Makefile b/sysutils/xentools411/patches/patch-tools_Makefile
index 35dfb358ef8..256f5c22fd1 100644
--- a/sysutils/xentools411/patches/patch-tools_Makefile
+++ b/sysutils/xentools411/patches/patch-tools_Makefile
@@ -1,7 +1,7 @@
-$NetBSD: patch-tools_Makefile,v 1.1 2018/07/24 13:40:11 bouyer Exp $
+$NetBSD: patch-tools_Makefile,v 1.2 2019/12/18 13:37:39 bouyer Exp $
---- tools/Makefile.orig 2018-04-17 19:21:31.000000000 +0200
-+++ tools/Makefile 2018-04-23 16:09:03.000000000 +0200
+--- 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
@@ -20,7 +20,7 @@ $NetBSD: patch-tools_Makefile,v 1.1 2018/07/24 13:40:11 bouyer Exp $
# These don't cross-compile
ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
-@@ -262,13 +262,13 @@
+@@ -262,17 +262,18 @@
-L$(XEN_ROOT)/tools/libs/gnttab \
-L$(XEN_ROOT)/tools/libs/foreignmemory \
-L$(XEN_ROOT)/tools/libs/devicemodel \
@@ -41,3 +41,8 @@ $NetBSD: patch-tools_Makefile,v 1.1 2018/07/24 13:40:11 bouyer Exp $
$(QEMU_UPSTREAM_RPATH)" \
--bindir=$(LIBEXEC_BIN) \
--datadir=$(SHAREDIR)/qemu-xen \
+ --localstatedir=$(localstatedir) \
++ --disable-opengl \
+ --disable-kvm \
+ --disable-docs \
+ --disable-guest-agent \