Date: Wed, 30 Oct 2024 10:53:59 +0000 From: Nuno Teixeira <eduardo@freebsd.org> To: "Jason E. Hale" <jhale@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-branches@freebsd.org Subject: Re: git: 8e9ad0847d59 - 2024Q4 - science/step: Fix build with LLVM >= 19.1.0-rc1 Message-ID: <CAFDf7UL3X889QV_7EtdTx8_p0SVedDQ_Byf9Lz4dnCUHGiZ5AA@mail.gmail.com> In-Reply-To: <202410300858.49U8wD5g095990@gitrepo.freebsd.org> References: <202410300858.49U8wD5g095990@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--000000000000aeea920625af8561 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello Jason, Could you take a look at sysutils/lnav upstream PR https://github.com/tstack/lnav/issues/1328 ? Any help is welcome. Cheers, Jason E. Hale <jhale@freebsd.org> escreveu (quarta, 30/10/2024 =C3=A0(s) 08= :58): > The branch 2024Q4 has been updated by jhale: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=3D8e9ad0847d59db0920a771915b16c= 66deceb2a80 > > commit 8e9ad0847d59db0920a771915b16c66deceb2a80 > Author: Jason E. Hale <jhale@FreeBSD.org> > AuthorDate: 2024-10-30 06:43:09 +0000 > Commit: Jason E. Hale <jhale@FreeBSD.org> > CommitDate: 2024-10-30 08:57:36 +0000 > > science/step: Fix build with LLVM >=3D 19.1.0-rc1 > > Clang >=3D 19.1.0-rc1 requires a template argument list after an > identifier > prefixed by the template keyword. [1] > > > /wrkdirs/usr/ports/science/step/work/step-23.08.5/stepcore/object.h:252:4= 5: > error: a template argument list is expected after a name prefixed by > the > template keyword [-Wmissing-template-arg-list-after-template-kw] > 252 | if(!src || !src->metaObject()->template inherits(_Dst())) > return NULL; > > [1] > https://github.com/llvm/llvm-project/commit/f46d1463b835560d90ad3ac02b63c= 771e4ebe566 > > Reported by: pkg-fallout > MFH: 2024Q2 > > (cherry picked from commit f812d021d79f6a4034640eece6b7ae1b32df21a0) > --- > science/step/files/patch-stepcore_object.h | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) > > diff --git a/science/step/files/patch-stepcore_object.h > b/science/step/files/patch-stepcore_object.h > new file mode 100644 > index 000000000000..5b2f47415a27 > --- /dev/null > +++ b/science/step/files/patch-stepcore_object.h > @@ -0,0 +1,21 @@ > +Clang >=3D 19.1.0-rc1 requires a template argument list after an identif= ier > +prefixed by the template keyword. [1] > + > > +/wrkdirs/usr/ports/science/step/work/step-23.08.5/stepcore/object.h:252:= 45: > +error: a template argument list is expected after a name prefixed by the > +template keyword [-Wmissing-template-arg-list-after-template-kw] > + 252 | if(!src || !src->metaObject()->template inherits(_Dst())) > return NULL; > + > +[1] > https://github.com/llvm/llvm-project/commit/f46d1463b835560d90ad3ac02b63c= 771e4ebe566 > + > +--- stepcore/object.h.orig 2024-02-10 03:35:30 UTC > ++++ stepcore/object.h > +@@ -249,7 +249,7 @@ _Dst stepcore_cast(_Src src) { > + /** Casts between pointers to Object */ > + template<class _Dst, class _Src> // XXX: implement it better > + _Dst stepcore_cast(_Src src) { > +- if(!src || !src->metaObject()->template inherits(_Dst())) return > NULL; > ++ if(!src || !src->metaObject()->template inherits<_Dst>(_Dst())) > return NULL; > + return static_cast<_Dst>(src); > + } > + > --=20 Nuno Teixeira FreeBSD UNIX: <eduardo@FreeBSD.org> Web: https://FreeBSD.org --000000000000aeea920625af8561 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div>Hello Jason,</div><div><br></div><div>Could you take = a look at sysutils/lnav upstream PR <a href=3D"https://github.com/tstack/ln= av/issues/1328">https://github.com/tstack/lnav/issues/1328</a>; ?<br><br></d= iv><div>Any help is welcome.<br><br></div><div>Cheers,<br></div></div><br><= div class=3D"gmail_quote"><div dir=3D"ltr" class=3D"gmail_attr">Jason E. Ha= le <<a href=3D"mailto:jhale@freebsd.org">jhale@freebsd.org</a>> escre= veu (quarta, 30/10/2024 =C3=A0(s) 08:58):<br></div><blockquote class=3D"gma= il_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,2= 04,204);padding-left:1ex">The branch 2024Q4 has been updated by jhale:<br> <br> URL: <a href=3D"https://cgit.FreeBSD.org/ports/commit/?id=3D8e9ad0847d59db0= 920a771915b16c66deceb2a80" rel=3D"noreferrer" target=3D"_blank">https://cgi= t.FreeBSD.org/ports/commit/?id=3D8e9ad0847d59db0920a771915b16c66deceb2a80</= a><br> <br> commit 8e9ad0847d59db0920a771915b16c66deceb2a80<br> Author:=C2=A0 =C2=A0 =C2=A0Jason E. Hale <jhale@FreeBSD.org><br> AuthorDate: 2024-10-30 06:43:09 +0000<br> Commit:=C2=A0 =C2=A0 =C2=A0Jason E. Hale <jhale@FreeBSD.org><br> CommitDate: 2024-10-30 08:57:36 +0000<br> <br> =C2=A0 =C2=A0 science/step: Fix build with LLVM >=3D 19.1.0-rc1<br> <br> =C2=A0 =C2=A0 Clang >=3D 19.1.0-rc1 requires a template argument list af= ter an identifier<br> =C2=A0 =C2=A0 prefixed by the template keyword. [1]<br> <br> =C2=A0 =C2=A0 /wrkdirs/usr/ports/science/step/work/step-23.08.5/stepcore/ob= ject.h:252:45:<br> =C2=A0 =C2=A0 error: a template argument list is expected after a name pref= ixed by the<br> =C2=A0 =C2=A0 template keyword [-Wmissing-template-arg-list-after-template-= kw]<br> =C2=A0 =C2=A0 =C2=A0 252 |=C2=A0 =C2=A0 =C2=A0if(!src || !src->metaObjec= t()->template inherits(_Dst())) return NULL;<br> <br> =C2=A0 =C2=A0 [1] <a href=3D"https://github.com/llvm/llvm-project/commit/f4= 6d1463b835560d90ad3ac02b63c771e4ebe566" rel=3D"noreferrer" target=3D"_blank= ">https://github.com/llvm/llvm-project/commit/f46d1463b835560d90ad3ac02b63c= 771e4ebe566</a><br> <br> =C2=A0 =C2=A0 Reported by:=C2=A0 =C2=A0 pkg-fallout<br> =C2=A0 =C2=A0 MFH:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 2024Q2<br> <br> =C2=A0 =C2=A0 (cherry picked from commit f812d021d79f6a4034640eece6b7ae1b32= df21a0)<br> ---<br> =C2=A0science/step/files/patch-stepcore_object.h | 21 +++++++++++++++++++++= <br> =C2=A01 file changed, 21 insertions(+)<br> <br> diff --git a/science/step/files/patch-stepcore_object.h b/science/step/file= s/patch-stepcore_object.h<br> new file mode 100644<br> index 000000000000..5b2f47415a27<br> --- /dev/null<br> +++ b/science/step/files/patch-stepcore_object.h<br> @@ -0,0 +1,21 @@<br> +Clang >=3D 19.1.0-rc1 requires a template argument list after an identi= fier<br> +prefixed by the template keyword. [1]<br> +<br> +/wrkdirs/usr/ports/science/step/work/step-23.08.5/stepcore/object.h:252:45= :<br> +error: a template argument list is expected after a name prefixed by the<b= r> +template keyword [-Wmissing-template-arg-list-after-template-kw]<br> +=C2=A0 252 |=C2=A0 =C2=A0 =C2=A0if(!src || !src->metaObject()->templ= ate inherits(_Dst())) return NULL;<br> +<br> +[1] <a href=3D"https://github.com/llvm/llvm-project/commit/f46d1463b835560= d90ad3ac02b63c771e4ebe566" rel=3D"noreferrer" target=3D"_blank">https://git= hub.com/llvm/llvm-project/commit/f46d1463b835560d90ad3ac02b63c771e4ebe566</= a><br> +<br> +--- stepcore/object.h.orig=C2=A0 =C2=A0 =C2=A02024-02-10 03:35:30 UTC<br> ++++ stepcore/object.h<br> +@@ -249,7 +249,7 @@ _Dst stepcore_cast(_Src src) {<br> + /** Casts between pointers to Object */<br> + template<class _Dst, class _Src> // XXX: implement it better<br> + _Dst stepcore_cast(_Src src) {<br> +-=C2=A0 =C2=A0 if(!src || !src->metaObject()->template inherits(_Dst= ())) return NULL;<br> ++=C2=A0 =C2=A0 if(!src || !src->metaObject()->template inherits<_= Dst>(_Dst())) return NULL;<br> +=C2=A0 =C2=A0 =C2=A0return static_cast<_Dst>(src);<br> + }<br> + <br> </blockquote></div><br clear=3D"all"><br><span class=3D"gmail_signature_pre= fix">-- </span><br><div dir=3D"ltr" class=3D"gmail_signature"><div dir=3D"l= tr"><div><font color=3D"#888888">Nuno Teixeira</font></div><div><div><font = color=3D"#888888"> FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 <a h= ref=3D"https://FreeBSD.org" rel=3D"noreferrer" target=3D"_blank">https://Fr= eeBSD.org</a><br></font></div></div></div></div> --000000000000aeea920625af8561--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFDf7UL3X889QV_7EtdTx8_p0SVedDQ_Byf9Lz4dnCUHGiZ5AA>