Date: Thu, 12 Jan 2017 20:59:18 -0600 From: John Marino <freebsd.contact@marino.st> To: "Carlos J. Puga Medina" <cpm@FreeBSD.org>, 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: <d11e0f8f-e8c0-217e-a994-e99f1cdf3e28@marino.st> In-Reply-To: <1484276172.95107.4.camel@FreeBSD.org> References: <201701130236.v0D2a8fN001308@repo.freebsd.org> <454077ca-b6ce-966f-2b83-17d3ac68b40b@marino.st> <1484276172.95107.4.camel@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 1/12/2017 20:56, Carlos J. Puga Medina wrote: > On Thu, 2017-01-12 at 20:39 -0600, John Marino wrote: >> On 1/12/2017 20:36, Carlos J. Puga Medina wrote: >>> >>> Author: cpm >>> Date: Fri Jan 13 02:36:08 2017 >>> New Revision: 431337 >>> URL: https://svnweb.freebsd.org/changeset/ports/431337 >>> >>> Log: >>> - Always check OPSYS along with OSVERSION >>> - Fix build on 11.0-STABLE [1] >>> >>> Reported by: Jonathan Chen <jonc@chen.org.nz> [1] via >>> email >>> Reviewed by: rene >>> Approved by: chromium (rene) >>> MFH: 2017Q1 (blanket) >>> >>> Modified: >>> head/www/chromium/Makefile >>> >>> Modified: head/www/chromium/Makefile >>> =================================================================== >>> =========== >>> --- head/www/chromium/Makefile Fri Jan 13 02:18:47 2017 >>> (r431336) >>> +++ head/www/chromium/Makefile Fri Jan 13 02:36:08 2017 >>> (r431337) >>> @@ -187,13 +187,13 @@ GN_ARGS+= is_clang=true >>> EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang >>> .endif >>> >>> -.if ${OSVERSION} < 1200017 >>> +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100508 >>> EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old >>> .else >>> EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-new >>> .endif >>> >>> -.if ${OSVERSION} < 1100000 >>> +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 >>> EXTRA_PATCHES+= ${FILESDIR}/extra-patch-10 >>> .endif >>> >> 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} == FreeBSD / .endif" so >> that >> they are skipped e.g. DragonFly. >> > > Hi John, > > 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. > > Could you verify it? > It didn't change it, it's always been wrong (probably locally patched). You can see if OPSYS==DragonFLy, then EXTRA_PATCHES gets ${FILESDIR}/extra-patch-libc++-new added to it. This is wrong; libc++ isn't used on DragonFly at all. So my point was, if you're going to change this, you should wrap the entire block in an OPSYS check. John --- This email has been checked for viruses by Avast antivirus software. https://www.avast.com/antivirus
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?d11e0f8f-e8c0-217e-a994-e99f1cdf3e28>