Date: Thu, 5 Nov 2015 18:20:21 +0300 From: Roman Bogorodskiy <bogorodskiy@gmail.com> To: Dmitry Marakasov <amdmi3@amdmi3.ru> Cc: Jason Helfman <jgh@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r379361 - head/devel/libvirt Message-ID: <20151105152019.GA2025@kloomba.lvv.mirantis.net> In-Reply-To: <20151104181817.GM57666@hades.panopticon> References: <201502191911.t1JJBBrO039538@svn.freebsd.org> <20151104181817.GM57666@hades.panopticon>
next in thread | previous in thread | raw e-mail | index | archive | help
--2fHTh5uZTiUOsy+g Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Dmitry Marakasov wrote: > * Jason Helfman (jgh@FreeBSD.org) wrote: >=20 > > 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/ > >=20 > > Log: > > - fix build failures on 8/9 (bhyve) > > =20 > > Reported by: mat@ > >=20 > > Modified: > > head/devel/libvirt/Makefile > > head/devel/libvirt/pkg-plist > >=20 > > Modified: head/devel/libvirt/Makefile > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- 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=3D dnsmasq:${PORTSDIR}/dns/d > > RUN_DEPENDS=3D dnsmasq:${PORTSDIR}/dns/dnsmasq > > =20 > > OPTIONS_DEFINE=3D DOCS NLS QEMU SASL > > -OPTIONS_DEFINE_amd64=3D BHYVE > > .if exists(/usr/sbin/bhyve) > > +OPTIONS_DEFINE_amd64=3D BHYVE > > OPTIONS_DEFAULT_amd64=3D BHYVE > > .endif > > QEMU_DESC=3D QEMU driver > > @@ -36,8 +36,6 @@ QEMU_LIB_DEPENDS=3D libyajl.so:${PORTSDIR} > > QEMU_RUN_DEPENDS=3D dmidecode:${PORTSDIR}/sysutils/dmidecode \ > > qemu-io:${PORTSDIR}/emulators/qemu-devel > > =20 > > -BHYVE_CONFIGURE_WITH=3D bhyve > > - > > NLS_USES=3D gettext > > NLS_CONFIGURE_ENABLE=3D nls > > NLS_CONFIGURE_ON=3D --with-libintl-prefix=3D${LOCALBASE} > > @@ -82,13 +80,15 @@ PORTDOCS=3D * > > =20 > > .include <bsd.port.options.mk> > > =20 > > -#work around an options bug (thanks mat@) > > -.if ${ARCH} !=3D amd64 > > -PLIST_SUB+=3D BHYVE=3D"@comment " > > +.if (exists(/usr/sbin/bhyve) && ${OSVERSION} >=3D 100051) > ^^^^^^ > I think you've missed a digit here. This condition is always true. Oh, well, this check actually looks a little strange. I think it's fine to hide the BHYVE option if /usr/sbin/bhyve is not defined. However, later we should not check it again, as well as OSVERSION, and just set proper CONFIGURE_ARGS based on the option value. I'll fix it soon (tomorrow or this weekend). Roman Bogorodskiy --2fHTh5uZTiUOsy+g Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJWO3OzAAoJEMltX/4IwiJqplAIAIRY/N/+Dx4b+BapZmIvh/Q1 xru6ckGq7sx7SN4M3O4JFcgBVoKfiHhvUUKevvOEJ3pdUyRpdn132mj1yjX9znPV +u8I5RC8k/pZ1EN9dKTmbUqYKbXiejQrrO6gVSf6MagpvMztqnRBN+e8KtboW+T6 F3HOLqpuTkf62vfaMfCNwOa/o6OsmlCcTR3aTE8YputrVUn9UsY/mLCLuVlyBsn/ ebv76Lfc+1NXIoSqC0YxsjYkowU77KVktgLTtBgz7eDjxexKKTZ3T9iH4PY4zQDb Gtc+8/wlLUR2UJuw6PWTs4iG7EoBdcN2Bv6qd7qIti9rvensUm16WvtLamL255A= =KxLv -----END PGP SIGNATURE----- --2fHTh5uZTiUOsy+g--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20151105152019.GA2025>