From nobody Fri Aug 16 15:39:12 2024 X-Original-To: dev-commits-ports-main@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 4WlmPY1Fjmz5T7K5; Fri, 16 Aug 2024 15:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WlmPX6ZYyz4cp3; Fri, 16 Aug 2024 15:39:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723822752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wPdqs0uqTRuAlC0BM70W19xhfgXtKNjNUEeXbMsMMIc=; b=lsquxzAawZh/494/ZBmGGhtW3c+Pd7AQ5TjWhgHh3rTZ+pBhtIeVx/Dg4UrseJBCy+iNfu ODhXm0Z9SLLoyMjBxOtN+k2mV0oQoy6pAihSO94R6K0/Xbz0RW+CZhNvhmpktw3UJWs6rq oEcV/ef7nPeJD9CTtQtIxb6Zzf3uVKcUD+GdIfLTuTVHm7+wNOuxP9KO9onbkJW4mvcWWP p7hZBBgM9KGx4pX/WHq2XrPTxwAFLdmRZcEG5OnqxPkwzPKrHRmbwlrbt7Uj8lxYdEPfQA Ul9yuG36x8OvTZmMzDnbWcmmPiTB+KjXQsWQsW/aJrKlXMSoJJ6pHWj1RAueDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723822752; a=rsa-sha256; cv=none; b=xu/9cV4+DR9hi1xIqUBddjlJR0UZHxYwgRzeZVQpqKyH1WgeVU/ubk6Rgpwhb49PT2imjZ MlUwxWojxVkVCP5t53igcKhLdpnsB/Gc1oF7RHRkPFrBwruKQI7MoXoh7T9uWFxt4+pjra KOYnqnHuWVWGxaYz03ChPuBzXmJH7YDiX8bSYew0beqpBH2eSdX42LuxM3bhMjLv+k8uvI 1TVEBZ2tX49N/CLAyPSfUQi6AP+HR4h12jVIhktOv/nYTjZqtnn2J6RZAJjMhBxMl4UpBk /VMBODRggWdwTX2zDSdWoD8PLFwcaG27W/sEiqx/J2Em2kH63j7Y3MYSX4CAOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723822752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wPdqs0uqTRuAlC0BM70W19xhfgXtKNjNUEeXbMsMMIc=; b=YfrrnxW4GORGtRgfAZwek+Vw3jlp8rNyH93QYONdfSoiDmfqPmFlU1yTOFV6G5UkLMBZa5 /QqKpDflFDzAjtmfb6+h+jPeYvnDNa+oKHQcl/Frq6urMsGGoT8MMQNNLJG3d3CwN4hGO5 +hZyI9GCXzK7weOTJ5t3hV3HJuh5DLokBF1j1BxlprQYKGMI4puo3Igp+c410tbFwpNTqM M0tJ2daG3QDBWvd5ovfU+DvLeuALL8UtQVh+byw8tRANu9lGAsJf/K64GdDdFtS6Q0UgOT M+9bWM61UKNGJg2Rb+MHYbtUxrLxag311R9fTqOq9vqniF9FtBJ64/AxjxH5UQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WlmPX635nz1Bnf; Fri, 16 Aug 2024 15:39:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47GFdCYh079491; Fri, 16 Aug 2024 15:39:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47GFdCHS079488; Fri, 16 Aug 2024 15:39:12 GMT (envelope-from git) Date: Fri, 16 Aug 2024 15:39:12 GMT Message-Id: <202408161539.47GFdCHS079488@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 8c86705f8b3c - main - devel/simdjson: fix build with clang 19 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c86705f8b3cead5d81271a071c331b619da4b8b Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=8c86705f8b3cead5d81271a071c331b619da4b8b commit 8c86705f8b3cead5d81271a071c331b619da4b8b Author: Dimitry Andric AuthorDate: 2024-08-03 13:58:40 +0000 Commit: Dimitry Andric CommitDate: 2024-08-16 15:33:49 +0000 devel/simdjson: fix build with clang 19 With clang 19, if a port uses simdjson.h, it leads to compile errors: In file included from /wrkdirs/usr/ports/sysutils/intel-pcm/work/pcm-202405/src/pcm-raw.cpp:31: /usr/local/include/simdjson.h:6156:13: error: no member named 'print_newline' in 'base_formatter' 6156 | this->print_newline(); | ~~~~ ^ /usr/local/include/simdjson.h:6160:13: error: no member named 'print_indents' in 'base_formatter' 6160 | this->print_indents(depth); | ~~~~ ^ /usr/local/include/simdjson.h:6164:13: error: no member named 'print_space' in 'base_formatter' 6164 | this->print_space(); | ~~~~ ^ Upstream fixes this, but it does not directly add the change to the generated single header version of simdjson.h. So apply the fix to both the individual header and the amalgamated version. PR: 280590 Approved by: olevole@olevole.ru (maintainer) MFH: 2024Q3 --- devel/simdjson/Makefile | 1 + .../patch-include_simdjson_dom_serialization.h | 21 +++++++++++++++++++++ devel/simdjson/files/patch-singleheader_simdjson.h | 21 +++++++++++++++++++++ 3 files changed, 43 insertions(+) diff --git a/devel/simdjson/Makefile b/devel/simdjson/Makefile index 69e8fe65332a..a035cc77293b 100644 --- a/devel/simdjson/Makefile +++ b/devel/simdjson/Makefile @@ -1,6 +1,7 @@ PORTNAME= simdjson DISTVERSIONPREFIX= v DISTVERSION= 3.6.2 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= olevole@olevole.ru diff --git a/devel/simdjson/files/patch-include_simdjson_dom_serialization.h b/devel/simdjson/files/patch-include_simdjson_dom_serialization.h new file mode 100644 index 000000000000..09dc68e86977 --- /dev/null +++ b/devel/simdjson/files/patch-include_simdjson_dom_serialization.h @@ -0,0 +1,21 @@ +--- include/simdjson/dom/serialization.h.orig 2023-12-01 18:56:12 UTC ++++ include/simdjson/dom/serialization.h +@@ -57,15 +57,15 @@ class base_formatter { (public) + simdjson_inline void one_char(char c); + + simdjson_inline void call_print_newline() { +- this->print_newline(); ++ static_cast(this)->print_newline(); + } + + simdjson_inline void call_print_indents(size_t depth) { +- this->print_indents(depth); ++ static_cast(this)->print_indents(depth); + } + + simdjson_inline void call_print_space() { +- this->print_space(); ++ static_cast(this)->print_space(); + } + + protected: diff --git a/devel/simdjson/files/patch-singleheader_simdjson.h b/devel/simdjson/files/patch-singleheader_simdjson.h new file mode 100644 index 000000000000..e41f85236f17 --- /dev/null +++ b/devel/simdjson/files/patch-singleheader_simdjson.h @@ -0,0 +1,21 @@ +--- singleheader/simdjson.h.orig 2023-12-01 18:56:12 UTC ++++ singleheader/simdjson.h +@@ -6153,15 +6153,15 @@ class base_formatter { (public) + simdjson_inline void one_char(char c); + + simdjson_inline void call_print_newline() { +- this->print_newline(); ++ static_cast(this)->print_newline(); + } + + simdjson_inline void call_print_indents(size_t depth) { +- this->print_indents(depth); ++ static_cast(this)->print_indents(depth); + } + + simdjson_inline void call_print_space() { +- this->print_space(); ++ static_cast(this)->print_space(); + } + + protected: