Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Aug 2017 13:24:45 +0000 (UTC)
From:      Roman Bogorodskiy <novel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r448098 - head/devel/libvirt
Message-ID:  <201708171324.v7HDOjsw036833@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: novel
Date: Thu Aug 17 13:24:45 2017
New Revision: 448098
URL: https://svnweb.freebsd.org/changeset/ports/448098

Log:
  devel/libvirt: add yajl dependency for nss
  
  The nss plugin requires yajl. It's pulled for qemu when it's enabled, but
  build fails when nss plugin is enabled and qemu driver is disabled, so
  add a dependency on yajl for both options.
  
  PR:		221279
  Reported by:	vvd@unislabs.com

Modified:
  head/devel/libvirt/Makefile

Modified: head/devel/libvirt/Makefile
==============================================================================
--- head/devel/libvirt/Makefile	Thu Aug 17 13:24:11 2017	(r448097)
+++ head/devel/libvirt/Makefile	Thu Aug 17 13:24:45 2017	(r448098)
@@ -41,9 +41,7 @@ OPTIONS_SUB=	yes
 
 BHYVE_CONFIGURE_WITH=	bhyve
 
-QEMU_CONFIGURE_WITH=	qemu yajl
-QEMU_CFLAGS=	-I${LOCALBASE}/include
-QEMU_LIB_DEPENDS=	libyajl.so:devel/yajl
+QEMU_CONFIGURE_WITH=	qemu
 QEMU_RUN_DEPENDS=	dmidecode:sysutils/dmidecode \
 			qemu-io:emulators/qemu
 
@@ -111,6 +109,11 @@ SUB_FILES=	pkg-message
 SUB_LIST+=	PORTVERSION="-${PORTVERSION}"
 
 .include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MQEMU} || ${PORT_OPTIONS:MNSS}
+LIB_DEPENDS+=		libyajl.so:devel/yajl
+CONFIGURE_ARGS+=	--with-yajl=${LOCALBASE}
+.endif
 
 .if !${PLIST_SUB:MXEN}
 PLIST_SUB+=	XEN="@comment "



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