From owner-svn-ports-all@freebsd.org Fri Jan 13 02:59:19 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
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 7FEFCCAD309;
Fri, 13 Jan 2017 02:59:19 +0000 (UTC)
(envelope-from freebsd.contact@marino.st)
Received: from shepard.synsport.com (mail.synsport.com [208.69.230.148])
(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 5616615E9;
Fri, 13 Jan 2017 02:59:18 +0000 (UTC)
(envelope-from freebsd.contact@marino.st)
Received: from [127.0.0.1] (ip72-204-83-236.fv.ks.cox.net [72.204.83.236])
(using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
(No client certificate requested)
by shepard.synsport.com (Postfix) with ESMTP id 72D8443D83;
Thu, 12 Jan 2017 20:57:52 -0600 (CST)
Subject: Re: svn commit: r431337 - head/www/chromium
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
References: <201701130236.v0D2a8fN001308@repo.freebsd.org>
<454077ca-b6ce-966f-2b83-17d3ac68b40b@marino.st>
<1484276172.95107.4.camel@FreeBSD.org>
Reply-To: marino@freebsd.org
From: John Marino <freebsd.contact@marino.st>
Message-ID: <d11e0f8f-e8c0-217e-a994-e99f1cdf3e28@marino.st>
Date: Thu, 12 Jan 2017 20:59:18 -0600
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101
Thunderbird/45.1.1
MIME-Version: 1.0
In-Reply-To: <1484276172.95107.4.camel@FreeBSD.org>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Antivirus: avast! (VPS 170112-1, 01/12/2017), Outbound message
X-Antivirus-Status: Clean
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Jan 2017 02:59:19 -0000
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