Date: Tue, 17 Jan 2017 18:53:46 +0900 From: Tomoaki AOKI <junchoon@dec.sakura.ne.jp> To: svn-ports-head@freebsd.org Cc: "Carlos J. Puga Medina" <cpm@FreeBSD.org> Subject: Re: Fw: Re: svn commit: r431339 - head/www/chromium Message-ID: <20170117185346.8a2db6c13d7770aa479a5d33@dec.sakura.ne.jp> In-Reply-To: <20170114231617.7892e1a41bdecd1ac960c5c0@dec.sakura.ne.jp> References: <20170113154515.028ab8592c271164e8e2083e@dec.sakura.ne.jp> <1484310802.1425.1.camel@FreeBSD.org> <20170114231617.7892e1a41bdecd1ac960c5c0@dec.sakura.ne.jp>
next in thread | previous in thread | raw e-mail | index | archive | help
Sorry, it was partially incorrect (not tested on head).
Was OK for stable/11, but reversed for head.
Below should work properly both stable/11 and head.
.if ${OSVERSION} > 1200016 || (${OSVERSION} >= 1100507 && ${OSVERSION}
< 1200000)
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-new
.else
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old
.endif
After writing this, I found r431706. This also is partially incorrect.
Comparing with previous one, patch file name is exchanged, causing OK
for head but reversed for stable/11.
Regards.
On Sat, 14 Jan 2017 23:16:17 +0900
Tomoaki AOKI <junchoon@dec.sakura.ne.jp> wrote:
> Thanks for looking in. Yours looks better than mine.
>
> In most cases, currently-committed one would be fine.
> But once someone sticking on revision range I noted (with some reason)
> complains (i.e., sent PR) , your new one should be better committed.
>
> Thanks again.
>
>
> On Fri, 13 Jan 2017 13:33:22 +0100
> "Carlos J. Puga Medina" <cpm@FreeBSD.org> wrote:
>
> > On Fri, 2017-01-13 at 15:45 +0900, Tomoaki AOKI wrote:
> > > Hi!
> > > Resent as missingly sent res to improper ML (freebsd-ports).
> > > It should be unclear there. Sigh...
> > >
> > >
> > > Begin forwarded message:
> > >
> > > Date: Fri, 13 Jan 2017 15:29:06 +0900
> > > From: Tomoaki AOKI <junchoon@dec.sakura.ne.jp>
> > > To: freebsd-ports@freebsd.org
> > > Cc: cpm@FreeBSD.org
> > > Subject: Re: svn commit: r431339 - head/www/chromium
> > >
> > >
> > > Hi!
> > >
> > > Can we assume all -head users update src at least "per month" basis?
> > > If so, no problem.
> > >
> > > If not, as __FreeBSD_version 1200018 came on Dec 7 15:04:22 2016 UTC
> > > at
> > > r309676, users sticking on src before this should need
> > > EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old.
> > >
> > > This case, version check portion for 11 and 12 should be as below.
> > >
> > >
> > > .if ${OSVERSION} < 1200017
> > > .if ${OSVERSION} > 1100507 && ${OSVERSION} < 1200000
> > > EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-new
> > > .else
> > > EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old
> > > .endif
> > > .else
> > > EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-new
> > > .endif
> > >
> > >
> >
> > To simplify the OSVERSION checks:
> >
> > .if ${OSVERSION} < 1200017 || (${OSVERSION} >= 1100507 && ${OSVERSION}
> > < 1200000)
> > EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-new
> > .else
> > EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old
> > .endif
> >
> > > This could be restored with yours after stable/12 is branched.
> > >
> > > Or making ports/UPDATING entry for -head users to update to latest
> > > base (at least after r309676) first before updating chromium could
> > > be enough.
> > >
> > > Regards.
> > >
> > > >
> > > > Author: cpm
> > > > Date: Fri Jan 13 03:18:05 2017
> > > > New Revision: 431339
> > > > URL: https://svnweb.freebsd.org/changeset/ports/431339
> > > >
> > > > Log:
> > > > 〓 - Wrap the entire block with OPSYS check
> > > > 〓〓
> > > > 〓 Reported by: marino
> > > > 〓 MFH: 2017Q1 (blanket)
> > > >
> > > > Modified:
> > > > 〓 head/www/chromium/Makefile
> > > >
> > > > Modified: head/www/chromium/Makefile
> > > > ===================================================================
> > > > ===========
> > > > --- head/www/chromium/Makefile Fri Jan 13 02:41:25 2017
> > > 〓(r431338)
> > > >
> > > > +++ head/www/chromium/Makefile Fri Jan 13 03:18:05
> > > 2017 (r431339)
> > > >
> > > > @@ -187,15 +187,17 @@ GN_ARGS+=
> > > is_clang=true
> > > >
> > > > 〓EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang
> > > > 〓.endif
> > > > 〓
> > > > -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100508
> > > > +.if ${OPSYS} == FreeBSD
> > > > +.if ${OSVERSION} < 1100508
> > > > 〓EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old
> > > > 〓.else
> > > > 〓EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-new
> > > > 〓.endif
> > > > 〓
> > > > -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000
> > > > +.if ${OSVERSION} < 1100000
> > > > 〓EXTRA_PATCHES+= ${FILESDIR}/extra-patch-10
> > > > 〓.endif
> > > > +.endif
> > > > 〓
> > > > 〓.if ! ${PORT_OPTIONS:MKERBEROS}
> > > > 〓GN_ARGS+= use_kerberos=true
> > > --〓
> > > Tomoaki AOKI〓〓〓〓<junchoon@dec.sakura.ne.jp>
> > >
> > >
> > --
> > Carlos Jacobo Puga Medina <cpm@FreeBSD.org>
> > PGP fingerprint = C60E 9497 5302 793B CC2D BB89 A1F3 5D66 E6D0 5453
>
>
> --
> 青木 知明 [Tomoaki AOKI] <junchoon@dec.sakura.ne.jp>
--
Tomoaki AOKI <junchoon@dec.sakura.ne.jp>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20170117185346.8a2db6c13d7770aa479a5d33>