From owner-svn-ports-all@freebsd.org Sun Nov 8 16:51:05 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 51D0FA298DE; Sun, 8 Nov 2015 16:51:05 +0000 (UTC) (envelope-from bogorodskiy@gmail.com) Received: from mail-lb0-x231.google.com (mail-lb0-x231.google.com [IPv6:2a00:1450:4010:c04::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C05631A22; Sun, 8 Nov 2015 16:51:04 +0000 (UTC) (envelope-from bogorodskiy@gmail.com) Received: by lbces9 with SMTP id es9so15109843lbc.2; Sun, 08 Nov 2015 08:51:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=hyqBRRuCGUhzVKhY7DJn1rZ+io3nFYIBxqxzg0Soxuw=; b=puNFE2BNbXyezLqxUI3nXAKAsOfe8ALkFV0xXJNesjP5M1X+GOg2YYYwv1+QimIhDz 9962V5N32AECBfHbYVizXvyp2YbTDm6HUEzQZiEQ7IqXODVsOBAZwRhy1+a6c0xMi9n9 jNZRoiKp+D44gBmQjxllFGsWH0MlUm5JG4BMB2W2yzUwAfJUnBKllXhynAzhBJlvDPdl 7ixbllJ4tAiVNkaEwg18Go3DAUrNbbBWcngseyWA1aJYyg1nXQlT2enASHjItdZuXtWX 0U+DOE+mJV1PTjlFosvICbXRLJA2ONg4cZkutT+du3rocYTgpnMFJlbvrEuktxBMD3ol 4uQA== X-Received: by 10.112.138.37 with SMTP id qn5mr12217105lbb.52.1447001461328; Sun, 08 Nov 2015 08:51:01 -0800 (PST) Received: from kloomba.lvv.mirantis.net ([217.65.211.30]) by smtp.gmail.com with ESMTPSA id w132sm145876lfd.11.2015.11.08.08.50.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Nov 2015 08:51:00 -0800 (PST) Date: Sun, 8 Nov 2015 19:50:55 +0300 From: Roman Bogorodskiy To: Dmitry Marakasov Cc: Jason Helfman , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r379361 - head/devel/libvirt Message-ID: <20151108165051.GD2188@kloomba.lvv.mirantis.net> References: <201502191911.t1JJBBrO039538@svn.freebsd.org> <20151104181817.GM57666@hades.panopticon> <20151105152019.GA2025@kloomba.lvv.mirantis.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="KdquIMZPjGJQvRdI" Content-Disposition: inline In-Reply-To: <20151105152019.GA2025@kloomba.lvv.mirantis.net> User-Agent: Mutt/1.5.24 (2015-08-30) X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2015 16:51:05 -0000 --KdquIMZPjGJQvRdI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Roman Bogorodskiy wrote: > Dmitry Marakasov wrote: >=20 > > * 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 > > > =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. >=20 > Oh, well, this check actually looks a little strange. >=20 > 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. >=20 > I'll fix it soon (tomorrow or this weekend). >=20 Hi, I have a fix, though I'm not sure if it's the best way to do things: https://reviews.freebsd.org/D4109 Reviews appreciated. Roman Bogorodskiy --KdquIMZPjGJQvRdI Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJWP31rAAoJEMltX/4IwiJqQO4IALb0mtaf1lByUZspXqWAgoUK MiCslVnZsaNGu94ZVA2Up1Pe3dstghpcOoNCUMniB0P6W3H9TfLZpPHfqiYAt0s2 3CaoWMdsJFwidt1PCLVssi3v8ywxn6hPLvuUPZNfMx5SK233KCf5DSMAQ8H32Lzc 3kOW3ukwlSPf8BK/jExUNzu1unZZOrhsa/J/DeEV05ylXtbopxJlkqsvBP+KBjqm MsYpOT936eORT87mggd3ve6R6c39cfWUm99jSq3NOvCR4mU5vSsyPvVANu6VFPXB 3O2Rd26DUN0gPieXM66EHzd5E2esnBAp9Xh76zaA+k9K+GqwAF6RyRuM4K7IdHg= =PMCt -----END PGP SIGNATURE----- --KdquIMZPjGJQvRdI--