Date: Fri, 13 Jan 2017 04:23:38 +0100 From: "Carlos J. Puga Medina" <cpm@FreeBSD.org> To: marino@freebsd.org, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r431337 - head/www/chromium Message-ID: <1484277818.95107.6.camel@FreeBSD.org> In-Reply-To: <d11e0f8f-e8c0-217e-a994-e99f1cdf3e28@marino.st> References: <201701130236.v0D2a8fN001308@repo.freebsd.org> <454077ca-b6ce-966f-2b83-17d3ac68b40b@marino.st> <1484276172.95107.4.camel@FreeBSD.org> <d11e0f8f-e8c0-217e-a994-e99f1cdf3e28@marino.st>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-ooMgzuX8S/yrOTrUxjgd Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, 2017-01-12 at 20:59 -0600, John Marino wrote: > On 1/12/2017 20:56, Carlos J. Puga Medina wrote: > >=20 > > On Thu, 2017-01-12 at 20:39 -0600, John Marino wrote: > > >=20 > > > On 1/12/2017 20:36, Carlos J. Puga Medina wrote: > > > >=20 > > > >=20 > > > > Author: cpm > > > > Date: Fri Jan 13 02:36:08 2017 > > > > New Revision: 431337 > > > > URL: https://svnweb.freebsd.org/changeset/ports/431337 > > > >=20 > > > > Log: > > > > =C2=A0 - Always check OPSYS along with OSVERSION > > > > =C2=A0 - Fix build on 11.0-STABLE [1] > > > >=20 > > > > =C2=A0 Reported by: Jonathan Chen <jonc@chen.org.nz> [1] via > > > > email > > > > =C2=A0 Reviewed by: rene > > > > =C2=A0 Approved by: chromium (rene) > > > > =C2=A0 MFH: 2017Q1 (blanket) > > > >=20 > > > > Modified: > > > > =C2=A0 head/www/chromium/Makefile > > > >=20 > > > > Modified: head/www/chromium/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/www/chromium/Makefile Fri Jan 13 02:18:47 2017=09 > > > > (r431336) > > > > +++ head/www/chromium/Makefile Fri Jan 13 02:36:08 2017=09 > > > > (r431337) > > > > @@ -187,13 +187,13 @@ GN_ARGS+=3D is_clang=3Dtrue > > > > =C2=A0EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch-clang > > > > =C2=A0.endif > > > >=20 > > > > -.if ${OSVERSION} < 1200017 > > > > +.if ${OPSYS} =3D=3D FreeBSD && ${OSVERSION} < 1100508 > > > > =C2=A0EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch-libc++-old > > > > =C2=A0.else > > > > =C2=A0EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch-libc++-new > > > > =C2=A0.endif > > > >=20 > > > > -.if ${OSVERSION} < 1100000 > > > > +.if ${OPSYS} =3D=3D FreeBSD && ${OSVERSION} < 1100000 > > > > =C2=A0EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch-10 > > > > =C2=A0.endif > > > >=20 > > > I'm not sure this change is correct. > > > It seems that none of the these extra patches should apply if > > > OPSYS > > > is > > > not FreeBSD, so it may have been better to wrap both of these > > > conditional statements with ".if ${OPSYS} =3D=3D FreeBSD / .endif" so > > > that > > > they are skipped e.g. DragonFly. > > >=20 > > Hi John, > >=20 > > I think that this change doesn't affect to Dragonfly. According to > > bsd.port.mk we can set to "FreeBSD," "NetBSD," or "OpenBSD" as > > appropriate. > >=20 > > Could you verify it? > >=20 > It didn't change it, it's always been wrong (probably locally > patched). >=20 > You can see if OPSYS=3D=3DDragonFLy, then EXTRA_PATCHES gets=C2=A0 > ${FILESDIR}/extra-patch-libc++-new added to it. > This is wrong; libc++ isn't used on DragonFly at all. >=20 > So my point was, if you're going to change this, you should wrap the=C2= =A0 > entire block in an OPSYS check. >=20 Fixed in r431339 Thanks John --=20 Carlos Jacobo Puga Medina <cpm@FreeBSD.org> PGP fingerprint =3D C60E 9497 5302 793B CC2D BB89 A1F3 5D66 E6D0 5453 --=-ooMgzuX8S/yrOTrUxjgd Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iQGTBAABCgB9FiEExg6Ul1MCeTvMLbuJofNdZubQVFMFAlh4SDpfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2 MEU5NDk3NTMwMjc5M0JDQzJEQkI4OUExRjM1RDY2RTZEMDU0NTMACgkQofNdZubQ VFNqXAf/U0mco/iqX4847WVz9/lwhXyb7wx2ZC6K3cJ3f3kpbjiu/1jIbSgMozVF pgGCPKpmTyKYE0OkjH5GzIU78wvbX7HEo+bk8OvZRenKzrUmg4vNTosXzuRi2764 U8WAvCo1MvxqnWgTKAtLc+nlR1ZRiNEzjpkduN/tpR2Vd310ii2ojoC4h0lo+uXi 7bMLnuQMAyUrK1788mjcJYY2xgcD0X6JWNCSOdzpEE3No9WkbevmAhD9JvRiiI5S PviXRec/jLeD8rWt19+NwOc1skfTuvPJuY28P/8A35gMGG9xhxLxuwKSquJuKhY2 rNqyhVPhjZ2QweL6Ib1c4iqwpKTqlw== =0Y2a -----END PGP SIGNATURE----- --=-ooMgzuX8S/yrOTrUxjgd--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1484277818.95107.6.camel>