svn commit: r431337 - head/www/chromium

[John Marino]

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 at 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