Date: Tue, 17 Jan 2017 11:58:26 +0100 From: "Carlos J. Puga Medina" <cpm@FreeBSD.org> To: Tomoaki AOKI <junchoon@dec.sakura.ne.jp>, svn-ports-head@freebsd.org Subject: Re: Fw: Re: svn commit: r431339 - head/www/chromium Message-ID: <1484650706.1656.4.camel@FreeBSD.org> In-Reply-To: <20170117185346.8a2db6c13d7770aa479a5d33@dec.sakura.ne.jp> References: <20170113154515.028ab8592c271164e8e2083e@dec.sakura.ne.jp> <1484310802.1425.1.camel@FreeBSD.org> <20170114231617.7892e1a41bdecd1ac960c5c0@dec.sakura.ne.jp> <20170117185346.8a2db6c13d7770aa479a5d33@dec.sakura.ne.jp>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-lqC/q85M2qHOooxQc6Fg
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
On Tue, 2017-01-17 at 18:53 +0900, Tomoaki AOKI wrote:
> Sorry, it was partially incorrect (not tested on head).
> Was OK for stable/11, but reversed for head.
>=20
> Below should work properly both stable/11 and head.
>=20
>=20
> .if ${OSVERSION} > 1200016 || (${OSVERSION} >=3D 1100507 &&
> ${OSVERSION}
> < 1200000)
> EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch-libc++-new
> .else
> EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch-libc++-old
> .endif
>=20
Mmm... It should be as following:
.if ${OSVERSION} > 1200017 || (${OSVERSION} >=3D 1100507 &&
${OSVERSION}>=C2=A0< 1200000)
EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch-libc++-new
.else
EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch-libc++-old
.endif
clang was updated to 3.9.0 on 12-CURRENT (r309124)
https://www.freebsd.org/doc/en/books/porters-handbook/versions.html#ver
sions-12
>=20
> 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.
>=20
Thanks for reporting, Tomoaki
> Regards.
>=20
>=20
> On Sat, 14 Jan 2017 23:16:17 +0900
> Tomoaki AOKI <junchoon@dec.sakura.ne.jp> wrote:
>=20
> >=20
> > Thanks for looking in. Yours looks better than mine.
> >=20
> > 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.
> >=20
> > Thanks again.
> >=20
> >=20
> > On Fri, 13 Jan 2017 13:33:22 +0100
> > "Carlos J. Puga Medina" <cpm@FreeBSD.org> wrote:
> >=20
> > >=20
> > > On Fri, 2017-01-13 at 15:45 +0900, Tomoaki AOKI wrote:
> > > >=20
> > > > Hi!
> > > > Resent as missingly sent res to improper ML (freebsd-ports).
> > > > It should be unclear there. Sigh...
> > > >=20
> > > >=20
> > > > Begin forwarded message:
> > > >=20
> > > > 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
> > > >=20
> > > >=20
> > > > Hi!
> > > >=20
> > > > Can we assume all -head users update src at least "per month"
> > > > basis?
> > > > If so, no problem.
> > > >=20
> > > > 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+=3D ${FILESDIR}/extra-patch-libc++-old.
> > > >=20
> > > > This case, version check portion for 11 and 12 should be as
> > > > below.
> > > >=20
> > > >=20
> > > > .if ${OSVERSION} < 1200017
> > > > .if ${OSVERSION} > 1100507 && ${OSVERSION} < 1200000
> > > > EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch-libc++-new
> > > > .else
> > > > EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch-libc++-old
> > > > .endif
> > > > .else
> > > > EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch-libc++-new
> > > > .endif
> > > >=20
> > > >=20
> > > To simplify the OSVERSION checks:
> > >=20
> > > .if ${OSVERSION} < 1200017 || (${OSVERSION} >=3D 1100507 &&
> > > ${OSVERSION}
> > > < 1200000)
> > > EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch-libc++-new
> > > .else
> > > EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch-libc++-old
> > > .endif
> > >=20
> > > >=20
> > > > This could be restored with yours after stable/12 is branched.
> > > >=20
> > > > Or making ports/UPDATING entry for -head users to update to
> > > > latest
> > > > base (at least after r309676) first before updating chromium
> > > > could
> > > > be enough.
> > > >=20
> > > > Regards.
> > > >=20
> > > > >=20
> > > > >=20
> > > > > Author: cpm
> > > > > Date: Fri Jan 13 03:18:05 2017
> > > > > New Revision: 431339
> > > > > URL: https://svnweb.freebsd.org/changeset/ports/431339
> > > > >=20
> > > > > Log:
> > > > > =E3=80=93 - Wrap the entire block with OPSYS check
> > > > > =E3=80=93=E3=80=93
> > > > > =E3=80=93 Reported by: marino
> > > > > =E3=80=93 MFH: 2017Q1 (blanket)
> > > > >=20
> > > > > Modified:
> > > > > =E3=80=93 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:41:25
> > > > > 2017
> > > > =E3=80=93(r431338)
> > > > >=20
> > > > >=20
> > > > > +++ head/www/chromium/Makefile Fri Jan 13 03:18:05
> > > > 2017 (r431339)
> > > > >=20
> > > > >=20
> > > > > @@ -187,15 +187,17 @@ GN_ARGS+=3D
> > > > is_clang=3Dtrue
> > > > >=20
> > > > >=20
> > > > > =E3=80=93EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch-clang
> > > > > =E3=80=93.endif
> > > > > =E3=80=93
> > > > > -.if ${OPSYS} =3D=3D FreeBSD && ${OSVERSION} < 1100508
> > > > > +.if ${OPSYS} =3D=3D FreeBSD
> > > > > +.if ${OSVERSION} < 1100508
> > > > > =E3=80=93EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch-libc++-old
> > > > > =E3=80=93.else
> > > > > =E3=80=93EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch-libc++-new
> > > > > =E3=80=93.endif
> > > > > =E3=80=93
> > > > > -.if ${OPSYS} =3D=3D FreeBSD && ${OSVERSION} < 1100000
> > > > > +.if ${OSVERSION} < 1100000
> > > > > =E3=80=93EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch-10
> > > > > =E3=80=93.endif
> > > > > +.endif
> > > > > =E3=80=93
> > > > > =E3=80=93.if ! ${PORT_OPTIONS:MKERBEROS}
> > > > > =E3=80=93GN_ARGS+=3D use_kerberos=3Dtrue
> > > > --=E3=80=93
> > > > Tomoaki AOKI=E3=80=93=E3=80=93=E3=80=93=E3=80=93<junchoon@dec.sakur=
a.ne.jp>
> > > >=20
> > > >=20
> > > --=C2=A0
> > > Carlos Jacobo Puga Medina <cpm@FreeBSD.org>
> > > PGP fingerprint =3D C60E 9497 5302 793B CC2D=C2=A0=C2=A0BB89 A1F3 5D6=
6 E6D0
> > > 5453
> >=20
> > --=C2=A0
> > =E9=9D=92=E6=9C=A8 =E7=9F=A5=E6=98=8E=C2=A0=C2=A0[Tomoaki AOKI]=C2=A0=
=C2=A0=C2=A0=C2=A0<junchoon@dec.sakura.ne.jp>
>=20
--=20
Carlos Jacobo Puga Medina <cpm@FreeBSD.org>
PGP fingerprint =3D C60E 9497 5302 793B CC2D BB89 A1F3 5D66 E6D0 5453
--=-lqC/q85M2qHOooxQc6Fg
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part
Content-Transfer-Encoding: 7bit
-----BEGIN PGP SIGNATURE-----
iQGTBAABCgB9FiEExg6Ul1MCeTvMLbuJofNdZubQVFMFAlh9+NNfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2
MEU5NDk3NTMwMjc5M0JDQzJEQkI4OUExRjM1RDY2RTZEMDU0NTMACgkQofNdZubQ
VFN+7Af9FCSSS6y0pqnJx6IHDNcRieinyaJyoF8krqjCiU/MjiuXL6OcqXAYjCpn
ohzsWrD2GqBYWzEo55UHvdtb6jIR5B+rDBFZgAXvaeQ5kctUwZaFtEoJkEdFZOF4
hxOecHWCRGcZ8rD6nFWTKnSC/A/WlguXeuQBvdexEIaPEDLM2bxafChltpxqh6iw
cl+sRyQdGJ3E1IhXGBMXOjW1BD07XLsF0SB9w2QUbBI/K27LNau7m8DCGihLBVQU
MRUdgk9HNsXTZxD0UZTghQNAChNkKWl6lH9eS2mfZ/JSklrhAOKBpOh9VAKoXhdg
OT3uCccekk2MsnII+Xf954s/OdQ9JQ==
=WDYb
-----END PGP SIGNATURE-----
--=-lqC/q85M2qHOooxQc6Fg--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1484650706.1656.4.camel>