From nobody Wed Oct 30 10:53:59 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XdkX51HjWz5b7Wt; Wed, 30 Oct 2024 10:54:13 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XdkX50gKRz4RG4; Wed, 30 Oct 2024 10:54:13 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730285653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=otFeZw+3HVD4wR0y0629CUO+lP+3hBzd6bO7LYFIpGU=; b=YzAjpHDNmCVLWPaUZdi8mS2npTRqdAepoLzA1lkfqGNzjN72MlQ/rLTOqFzEygX1B4yMng eLAO8vYLe9MRTeqIdk/sgHzlxkRF7OxqhPWyI510vSJgRGLW3MuPHf1qxG2v4GGImV2o8R oMI3UYKnHLEUwsRQlTIs+v9JpcyOLp2+iY/rjbjKkH931SIhEpdOWDTY+JYJq5OziFIoyE gBZaJ0aKG0W4FKcWbmTzWjJjZ6zv0BzDTWoSARqW3wyMj+70o1vki7OS+oWyEduZ9AWKzp KgFMKgYoFjFqkUOyhhAzuA9A1v+nrem+whNGcuwH8dKtxHKSFjL43RP6oeeiYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730285653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=otFeZw+3HVD4wR0y0629CUO+lP+3hBzd6bO7LYFIpGU=; b=I5lHXT17cx6AnNdLCtZqdkg6FIAyWAE8WMsiii62XyG98edlpJ8zk+egy296R6vNhi1L01 zd8X0TIlZYFC5wE6WN9Clbrgo/5hfJM4A27tYQHhVIr0imO8qp6bd41+3QknZKPhpzgdi9 AR8DtNZPXmOPbRmKJqOG1zKWBgWWXb4qieB65YstpKb2orCkOt0Yy5kWMRcYqaxVta62yM jbvEEpwDAdOCfzVNOiCkRbD8pzFXgerry+UN3WEDo8degUBlGWvv5OkqBzqnoC56F/xVgJ SDVzLQgb12IyVPfMDg9ZGIgGXj7uGxfk1/HJw8J9uXaKHWt053mqBN4Bh1nkBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730285653; a=rsa-sha256; cv=none; b=gYGv6QeCP8hu6MKAafaxU5CAj1MRAc7LsUuuBTgOIo45BZ6JC1aBD8U22rXhq30ZpJX4G2 HdM9lWUaTMercBVHlH6U9PfPvFX/IUJlLMIjU6dbX30jZsrBcU9RVR5uKeUjD8q08uTMYl 7NEDYlku2ohv0zVSWsItTy4BUSQHQN1ugvGyp1a3vNHAAI8NZHLeOxfi0z1vgFqiBSNbKJ Dv6IyzCXbzS3pKEzjomkxcjE9YlUVjsN98QWdKpxzwnPMQeg4ebg0NgQJTS9A0mCS7go3J saWONIh1CzrI7zZhLmgp2CQaINvBBXTT9kMpN89FAxkG/zR2jfkaFOIRzLp1fQ== Received: from mail-qv1-f48.google.com (mail-qv1-f48.google.com [209.85.219.48]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4XdkX507tVzDpW; Wed, 30 Oct 2024 10:54:12 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qv1-f48.google.com with SMTP id 6a1803df08f44-6cbf3f7272eso7006386d6.3; Wed, 30 Oct 2024 03:54:12 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCWZ79wzFrNFvMlAm7ueAkP7EpCEaR9vr/fL0zHdCxUgPeChuQ4zFhAWvAy2021kuQUTbeznqiU05ebxbCCtcGhMQVHKDd0=@freebsd.org, AJvYcCXfbTGyP+uwqf/RH3CGJJqpfyzjSJ9fFgfj6+akYm6A8fai4LEWLzPUrEKGU63li6fhbUsJzVClBgyyQo969s5Ao9syFYKit6QFrlU=@freebsd.org X-Gm-Message-State: AOJu0Yw9HzOV4kkN3KrSHmTL1Tx3i2lzsZUEGgw1MmQEM8A3zGuldm0f UQw3ZiDQvSDBl40ycvaZ4yx/LbcEwoNxkPM6LgnHDvMxDaG2Ggp4iyvNSQmCJkHntl5AgXTyjux +2aZowTeS4jj1kp88AoOhhA2j8rU= X-Google-Smtp-Source: AGHT+IFVAfmJeHPEQOqR7Xd3USXVMjYbpIzIeAXtkAMkfhyGc0KgjVO34LN2YgpIEky+QaRMmCrLwj6I96x2wyTHK7A= X-Received: by 2002:ac8:7dc2:0:b0:461:4cdf:c9e6 with SMTP id d75a77b69052e-461602a7d96mr48522241cf.16.1730285652596; Wed, 30 Oct 2024 03:54:12 -0700 (PDT) List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 References: <202410300858.49U8wD5g095990@gitrepo.freebsd.org> In-Reply-To: <202410300858.49U8wD5g095990@gitrepo.freebsd.org> From: Nuno Teixeira Date: Wed, 30 Oct 2024 10:53:59 +0000 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 8e9ad0847d59 - 2024Q4 - science/step: Fix build with LLVM >= 19.1.0-rc1 To: "Jason E. Hale" Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-branches@freebsd.org Content-Type: multipart/alternative; boundary="000000000000aeea920625af8561" --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 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 > AuthorDate: 2024-10-30 06:43:09 +0000 > Commit: Jason E. Hale > 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 // 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: Web: https://FreeBSD.org --000000000000aeea920625af8561 Content-Type: text/html; 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,

<= div class=3D"gmail_quote">
Jason E. Ha= le <jhale@freebsd.org> escre= veu (quarta, 30/10/2024 =C3=A0(s) 08:58):
The branch 2024Q4 has been updated by jhale:

URL: https://cgi= t.FreeBSD.org/ports/commit/?id=3D8e9ad0847d59db0920a771915b16c66deceb2a80

commit 8e9ad0847d59db0920a771915b16c66deceb2a80
Author:=C2=A0 =C2=A0 =C2=A0Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2024-10-30 06:43:09 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2024-10-30 08:57:36 +0000

=C2=A0 =C2=A0 science/step: Fix build with LLVM >=3D 19.1.0-rc1

=C2=A0 =C2=A0 Clang >=3D 19.1.0-rc1 requires a template argument list af= ter an identifier
=C2=A0 =C2=A0 prefixed by the template keyword. [1]

=C2=A0 =C2=A0 /wrkdirs/usr/ports/science/step/work/step-23.08.5/stepcore/ob= ject.h:252:45:
=C2=A0 =C2=A0 error: a template argument list is expected after a name pref= ixed by the
=C2=A0 =C2=A0 template keyword [-Wmissing-template-arg-list-after-template-= kw]
=C2=A0 =C2=A0 =C2=A0 252 |=C2=A0 =C2=A0 =C2=A0if(!src || !src->metaObjec= t()->template inherits(_Dst())) return NULL;

=C2=A0 =C2=A0 [1]
https://github.com/llvm/llvm-project/commit/f46d1463b835560d90ad3ac02b63c= 771e4ebe566

=C2=A0 =C2=A0 Reported by:=C2=A0 =C2=A0 pkg-fallout
=C2=A0 =C2=A0 MFH:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 2024Q2

=C2=A0 =C2=A0 (cherry picked from commit f812d021d79f6a4034640eece6b7ae1b32= df21a0)
---
=C2=A0science/step/files/patch-stepcore_object.h | 21 +++++++++++++++++++++=
=C2=A01 file changed, 21 insertions(+)

diff --git a/science/step/files/patch-stepcore_object.h b/science/step/file= s/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 identi= fier
+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]
+=C2=A0 252 |=C2=A0 =C2=A0 =C2=A0if(!src || !src->metaObject()->templ= ate inherits(_Dst())) return NULL;
+
+[1] https://git= hub.com/llvm/llvm-project/commit/f46d1463b835560d90ad3ac02b63c771e4ebe566
+
+--- stepcore/object.h.orig=C2=A0 =C2=A0 =C2=A02024-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) {
+-=C2=A0 =C2=A0 if(!src || !src->metaObject()->template inherits(_Dst= ())) return NULL;
++=C2=A0 =C2=A0 if(!src || !src->metaObject()->template inherits<_= Dst>(_Dst())) return NULL;
+=C2=A0 =C2=A0 =C2=A0return static_cast<_Dst>(src);
+ }
+


--
--000000000000aeea920625af8561--