svn commit: r379361 - head/devel/libvirt

[Dmitry Marakasov]

* Jason Helfman (jgh at FreeBSD.org) wrote:

> Author: jgh
> Date: Thu Feb 19 19:11:10 2015
> New Revision: 379361
> URL: https://svnweb.freebsd.org/changeset/ports/379361
> QAT: https://qat.redports.org/buildarchive/r379361/
> 
> Log:
>   - fix build failures on 8/9 (bhyve)
>   
>   Reported by:	mat@
> 
> Modified:
>   head/devel/libvirt/Makefile
>   head/devel/libvirt/pkg-plist
> 
> Modified: head/devel/libvirt/Makefile
> ==============================================================================
> --- head/devel/libvirt/Makefile	Thu Feb 19 19:10:48 2015	(r379360)
> +++ head/devel/libvirt/Makefile	Thu Feb 19 19:11:10 2015	(r379361)
> @@ -21,8 +21,8 @@ BUILD_DEPENDS=	dnsmasq:${PORTSDIR}/dns/d
>  RUN_DEPENDS=	dnsmasq:${PORTSDIR}/dns/dnsmasq
>  
>  OPTIONS_DEFINE=	DOCS NLS QEMU SASL
> -OPTIONS_DEFINE_amd64=	BHYVE
>  .if exists(/usr/sbin/bhyve)
> +OPTIONS_DEFINE_amd64=	BHYVE
>  OPTIONS_DEFAULT_amd64=	BHYVE
>  .endif
>  QEMU_DESC=	QEMU driver
> @@ -36,8 +36,6 @@ QEMU_LIB_DEPENDS=	libyajl.so:${PORTSDIR}
>  QEMU_RUN_DEPENDS=	dmidecode:${PORTSDIR}/sysutils/dmidecode \
>  			qemu-io:${PORTSDIR}/emulators/qemu-devel
>  
> -BHYVE_CONFIGURE_WITH=	bhyve
> -
>  NLS_USES=	gettext
>  NLS_CONFIGURE_ENABLE=	nls
>  NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
> @@ -82,13 +80,15 @@ PORTDOCS=	*
>  
>  .include <bsd.port.options.mk>
>  
> -#work around an options bug (thanks mat@)
> -.if ${ARCH} != amd64
> -PLIST_SUB+=	BHYVE="@comment "
> +.if (exists(/usr/sbin/bhyve) && ${OSVERSION} >= 100051)
                                                   ^^^^^^
I think you've missed a digit here. This condition is always true.

-- 
Dmitry Marakasov   .   55B5 0596 FF1E 8D84 5F56  9510 D35A 80DD F9D2 F77D
amdmi3 at amdmi3.ru  ..:  jabber: amdmi3 at jabber.ru      http://amdmi3.ru