Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 30 Apr 2020 08:37:02 +0000 (UTC)
From:      =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= <royger@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r533418 - head/sysutils/xen-tools
Message-ID:  <202004300837.03U8b2Lg023758@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: royger (src committer)
Date: Thu Apr 30 08:37:02 2020
New Revision: 533418
URL: https://svnweb.freebsd.org/changeset/ports/533418

Log:
  sysutils/xen-tools: fix build with clang and lld 10
  
  Disable QEMU user support, it's not used by Xen and doesn't currently
  build with lld 10 and the QEMU version shipped by Xen. Also pass
  -Wno-misleading-indentation to fix the build with clang 10.
  
  Approved by:		bapt
  Sponsored by:		Citrix Systems R&D
  Differential revision:	https://reviews.freebsd.org/D24482

Modified:
  head/sysutils/xen-tools/Makefile

Modified: head/sysutils/xen-tools/Makefile
==============================================================================
--- head/sysutils/xen-tools/Makefile	Thu Apr 30 08:17:34 2020	(r533417)
+++ head/sysutils/xen-tools/Makefile	Thu Apr 30 08:37:02 2020	(r533418)
@@ -27,7 +27,8 @@ OPTIONS_DEFAULT=	DOCS
 OPTIONS_SUB=		yes
 
 SPICE_DESC=		Enable SPICE protocol for QEMU
-SPICE_CONFIGURE_WITH=	extra-qemuu-configure-args="--enable-spice"
+SPICE_CONFIGURE_ON=	--with-extra-qemuu-configure-args="--enable-spice --disable-user"
+SPICE_CONFIGURE_OFF=	--with-extra-qemuu-configure-args="--disable-user"
 SPICE_BUILD_DEPENDS=	spice-protocol>=0.12.10:devel/spice-protocol
 SPICE_LIB_DEPENDS=	libspice-server.so:devel/libspice-server
 
@@ -41,7 +42,7 @@ USE_LDCONFIG=	yes
 USE_PYTHON=	py3kplist
 HAS_CONFIGURE=	yes
 # Set ARCH=x86_64 in order to overwrite the environment ARCH=amd64
-MAKE_ARGS=	clang=y ARCH=x86_64
+MAKE_ARGS=	clang=y ARCH=x86_64 EXTRA_CFLAGS_XEN_TOOLS=-Wno-misleading-indentation
 
 CONFIGURE_ARGS+=	--with-system-seabios=${LOCALBASE}/share/seabios/bios.bin \
 			--mandir=${MANPREFIX}/man



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004300837.03U8b2Lg023758>