head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.2.0.6
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.4
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.2
	pkgsrc-2025Q3-base:1.2;
locks; strict;
comment	@# @;


1.2
date	2025.09.04.21.03.58;	author bouyer;	state Exp;
branches;
next	1.1;
commitid	fVEzLYop9TLqlr9G;

1.1
date	2025.08.22.09.00.13;	author bouyer;	state Exp;
branches;
next	;
commitid	Ltq5S1fi9LiRKH7G;


desc
@@


1.2
log
@explicitely pass --disable-sdl --disable-sdl-image to qemu's configure
script to avoid pickng up sdl2-config by accident. Issue reported by martin@@
The build would fail if sd2-config was found so no PKGREVISION bump needed
@
text
@$NetBSD: patch-tools_Makefile,v 1.1 2025/08/22 09:00:13 bouyer Exp $

--- tools/Makefile.orig	2025-08-04 15:22:34.000000000 +0200
+++ tools/Makefile	2025-09-04 22:36:26.953813754 +0200
@@@@ -35,7 +35,6 @@@@
 SUBDIRS-y += 9pfsd
 SUBDIRS-$(CONFIG_X86) += xenpaging
 SUBDIRS-$(CONFIG_X86) += debugger
-SUBDIRS-$(CONFIG_TESTS) += tests
 
 SUBDIRS-y += python
 SUBDIRS-$(CONFIG_PYGRUB) += pygrub
@@@@ -231,7 +230,7 @@@@
 	else \
 		virtfs='' ; \
 	fi ; \
-	PKG_CONFIG_PATH=$(XEN_ROOT)/tools/pkg-config$${PKG_CONFIG_PATH:+:$${PKG_CONFIG_PATH}} \
+	PKG_CONFIG_PATH=$(XEN_ROOT)/tools/pkg-config$${PKG_CONFIG_PATH:+:$${PKG_CONFIG_PATH}} CFLAGS= \
 	$$source/configure --enable-xen --target-list=i386-softmmu \
 		$(QEMU_XEN_ENABLE_DEBUG) \
 		$$enable_trace_backend \
@@@@ -247,6 +246,8 @@@@
 		--bindir=$(LIBEXEC_BIN) \
 		--datadir=$(SHAREDIR)/qemu-xen \
 		--localstatedir=$(localstatedir) \
+		--disable-opengl \
+		--disable-sdl --disable-sdl-image \
 		--docdir=$(LIBEXEC)/share/doc \
 		--mandir=$(LIBEXEC)/share/man \
 		--libexecdir=$(LIBEXEC)/libexec \
@@@@ -259,7 +260,7 @@@@
 		--cpu=$(IOEMU_CPU_ARCH) \
 		$(IOEMU_CONFIGURE_CROSS) \
 		$$virtfs; \
-	$(MAKE) all
+	CFLAGS= $(MAKE) all
 
 subdir-install-qemu-xen-dir: subdir-all-qemu-xen-dir
 	cd qemu-xen-build; \
@


1.1
log
@Add xenkernel420 and xentools420 packages version 20250821, providing Xen
kernels and tools from the stable-4.20 branch (as of 20250821).
@
text
@d1 1
a1 1
$NetBSD: patch-tools_Makefile,v 1.1 2023/11/21 11:37:03 bouyer Exp $
d4 1
a4 1
+++ tools/Makefile	2025-08-21 16:34:11.296454784 +0200
d22 1
a22 1
@@@@ -247,6 +246,7 @@@@
d27 1
d31 1
a31 1
@@@@ -259,7 +259,7 @@@@
@