Date: Thu, 19 Feb 2015 19:11:11 +0000 (UTC) From: Jason Helfman <jgh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379361 - head/devel/libvirt Message-ID: <201502191911.t1JJBBrO039538@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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) +CONFIGURE_ARGS+= --with-bhyve +.else +CONFIGURE_ARGS+= --without-bhyve .endif .if ${PORT_OPTIONS:MBHYVE} -STRIP_FILES+= libvirt/connection-driver/libvirt_driver_bhyve.so +STRIP_FILES+= lib/libvirt/connection-driver/libvirt_driver_bhyve.so +PLIST_FILES+= lib/libvirt/connection-driver/libvirt_driver_bhyve.so .endif post-patch: @@ -119,6 +119,12 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} .endfor +.if ${PORT_OPTIONS:MBHYVE} +.for strip in ${STRIP_FILES} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${strip} +.endfor +.endif + .for dir in run/libvirt/network \ run/libvirt/qemu \ run/libvirt/lockd \ Modified: head/devel/libvirt/pkg-plist ============================================================================== --- head/devel/libvirt/pkg-plist Thu Feb 19 19:10:48 2015 (r379360) +++ head/devel/libvirt/pkg-plist Thu Feb 19 19:11:10 2015 (r379361) @@ -289,7 +289,6 @@ share/gtk-doc/html/libvirt/up.png %%NLS%%share/locale/zh_TW/LC_MESSAGES/libvirt.mo %%NLS%%share/locale/zu/LC_MESSAGES/libvirt.mo %%QEMU%%lib/libvirt/connection-driver/libvirt_driver_qemu.so -%%BHYVE%%lib/libvirt/connection-driver/libvirt_driver_bhyve.so lib/libvirt/connection-driver/libvirt_driver_network.so lib/libvirt/connection-driver/libvirt_driver_secret.so lib/libvirt/connection-driver/libvirt_driver_storage.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502191911.t1JJBBrO039538>