Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1578883825155660"
MIME-Version: 1.0
Date: Mon, 13 Jan 2020 02:50:25 +0000
From: "David H. Gutteridge" <gutteridge@netbsd.org>
Subject: CVS commit: pkgsrc/emulators/qemu
To: pkgsrc-changes@NetBSD.org
Reply-To: gutteridge@netbsd.org
Message-Id: <20200113025025.5105DFBF4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1578883825155660
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	gutteridge
Date:		Mon Jan 13 02:50:25 UTC 2020

Modified Files:
	pkgsrc/emulators/qemu: Makefile options.mk

Log Message:
qemu: fix Linux build in most environments

Addresses PR pkg/54772, reported by and patch tested by Ottavio Caruso.
virtfs-proxy-helper is only built if two development libraries (for
libcap and libattr) are installed, which typically aren't included by
default in Linux distros. Make virtfs support a non-default option that
someone would enable when they expressly want it, and they have first
installed the necessary upstream header packages to support the
compilation of this option.


To generate a diff of this commit:
cvs rdiff -u -r1.225 -r1.226 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/emulators/qemu/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1578883825155660
Content-Disposition: inline
Content-Length: 2254
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/emulators/qemu/Makefile
diff -u pkgsrc/emulators/qemu/Makefile:1.225 pkgsrc/emulators/qemu/Makefile:1.226
--- pkgsrc/emulators/qemu/Makefile:1.225	Sun Jan 12 20:20:13 2020
+++ pkgsrc/emulators/qemu/Makefile	Mon Jan 13 02:50:25 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.225 2020/01/12 20:20:13 ryoon Exp $
+# $NetBSD: Makefile,v 1.226 2020/01/13 02:50:25 gutteridge Exp $
 
 DISTNAME=	qemu-4.2.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.qemu.org/
 EXTRACT_SUFX=	.tar.xz
@@ -125,14 +125,13 @@ PLIST.bridge-helper=		yes
 PLIST.nbd=			yes
 PLIST.ivshmem=			yes
 PLIST.pr-helper=		yes
-PLIST.virtfs-proxy-helper=	yes
 .elif !empty(MACHINE_PLATFORM:MSunOS-5.11-*)
 PLIST.ivshmem=			yes
 PLIST.nbd=			yes
 CONFIGURE_ARGS+=		--disable-coroutine-pool
 .endif
 
-PLIST_VARS+=		${UE_ARCHS} bridge-helper ivshmem keymap nbd pr-helper virtfs-proxy-helper
+PLIST_VARS+=		${UE_ARCHS} bridge-helper ivshmem keymap nbd pr-helper
 .for pvar in ${USER_EMUL}
 PLIST.${pvar}=		yes
 .endfor

Index: pkgsrc/emulators/qemu/options.mk
diff -u pkgsrc/emulators/qemu/options.mk:1.5 pkgsrc/emulators/qemu/options.mk:1.6
--- pkgsrc/emulators/qemu/options.mk:1.5	Tue Aug 14 06:57:26 2018
+++ pkgsrc/emulators/qemu/options.mk	Mon Jan 13 02:50:25 2020
@@ -1,17 +1,21 @@
-# $NetBSD: options.mk,v 1.5 2018/08/14 06:57:26 adam Exp $
+# $NetBSD: options.mk,v 1.6 2020/01/13 02:50:25 gutteridge Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.qemu
 PKG_SUPPORTED_OPTIONS=	gtk3 sdl
 
 .include "../../mk/bsd.fast.prefs.mk"
 
+.if ${OPSYS} == "Linux"
+PKG_SUPPORTED_OPTIONS+=	virtfs-proxy-helper
+.endif
+
 .if ${OPSYS} != "Darwin"
 PKG_SUGGESTED_OPTIONS+=	sdl
 .endif
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		gtk
+PLIST_VARS+=		gtk virtfs-proxy-helper
 
 .if !empty(PKG_OPTIONS:Mgtk3)
 PLIST.gtk=		yes
@@ -27,3 +31,12 @@ CONFIGURE_ARGS+=	--enable-sdl
 .else
 CONFIGURE_ARGS+=	--disable-sdl
 .endif
+
+# NB to successfully build virtfs-proxy-helper, the upstream Linux
+# header/development libraries for libcap and libattr must be installed.
+.if !empty(PKG_OPTIONS:Mvirtfs-proxy-helper)
+PLIST.virtfs-proxy-helper=	yes
+CONFIGURE_ARGS+=		--enable-virtfs
+.else
+CONFIGURE_ARGS+=		--disable-virtfs
+.endif


--_----------=_1578883825155660--