Date: Fri, 20 Feb 2015 00:00:30 +0000 (UTC) From: Jason Helfman <jgh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r379404 - branches/2015Q1/devel/libvirt Message-ID: <201502200000.t1K00U7M080929@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jgh Date: Fri Feb 20 00:00:30 2015 New Revision: 379404 URL: https://svnweb.freebsd.org/changeset/ports/379404 QAT: https://qat.redports.org/buildarchive/r379404/ Log: MFH: r379361 - fix build failures on 8/9 (bhyve) Reported by: mat@ Approved by: portmgr (mat) Modified: branches/2015Q1/devel/libvirt/Makefile branches/2015Q1/devel/libvirt/pkg-plist Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/devel/libvirt/Makefile ============================================================================== --- branches/2015Q1/devel/libvirt/Makefile Thu Feb 19 23:27:01 2015 (r379403) +++ branches/2015Q1/devel/libvirt/Makefile Fri Feb 20 00:00:30 2015 (r379404) @@ -21,8 +21,8 @@ BUILD_DEPENDS= dnsmasq:${PORTSDIR}/dns/d RUN_DEPENDS= dnsmasq:${PORTSDIR}/dns/dnsmasq OPTIONS_DEFINE= DOCS NLS QEMU -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} @@ -79,13 +77,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: @@ -116,6 +116,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: branches/2015Q1/devel/libvirt/pkg-plist ============================================================================== --- branches/2015Q1/devel/libvirt/pkg-plist Thu Feb 19 23:27:01 2015 (r379403) +++ branches/2015Q1/devel/libvirt/pkg-plist Fri Feb 20 00:00:30 2015 (r379404) @@ -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?201502200000.t1K00U7M080929>