From nobody Fri Aug 16 15:44:46 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 4WlmWz0lPXz5T7rx; Fri, 16 Aug 2024 15:44:47 +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 4WlmWz07gvz4f3B; Fri, 16 Aug 2024 15:44:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723823087; 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=5DP1P1s9VzNaT5BdyBeVlgf+sd4sRt4vQQmdNsciPrM=; b=Bzf5NfB6/FBHBLu66/KIxPvOCrQlHcEVbavB2Jfgf75mARw4WjLLBGgjYfcf81aZmTMZjD zzRYB4AeGW97vfDbSLnJ3BrGQGS/sUxtvjbzf2SYT70VMHTJMJqJAeFk7CoAAesK/lZU4k Uybv0gYlabMZLF212pbIPTbw/ld4DsTwq4xaciOwOKsLzl59CtAEqz+ig9RwJrBM5DQ9ZY SH9h5zuV9U4OBK0TU7w7ZlMZd9W9rOs5r2YgSHNx42RcMg+YWZZ1WuxVguHqvb0qhH4R3T 9eaJN3KTiBd3rUJDgLPxwSMMvvFxAxcp1NLyXP2Z8IrNMSGjLUs8huC5lYahLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723823087; a=rsa-sha256; cv=none; b=FKemUMY/OAHaL5FBqpolooDxsfbvkFxucCrKmt9hLlUhrnISj3NpGAj8GzHS5XEPyNbbJE PDkaT8u2pLugBnZkXPypgLFTDQ+jnOW4+8MHL5CYJ4GoMFpO5ypXaRhIuST/OLNFv3M0vY pAfoRS488zJshi5YHUCBGWDxXmXYpTVzDWMHC6Vbhts/OgamJwXMhu4k9COb8XgiLz0NP0 5nLoxygMLNpWXjWUW4/ZwMS6Xw7VwBEUQpFmun2moLSdsIS4vibtTMS6L49TAUh0MArk41 cx1F0QeLRBCKOOBsYkKaO+6QEN7aNu3O5aALm5hF7cr0moEFwTdUf6IaTJrSNQ== 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=1723823087; 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=5DP1P1s9VzNaT5BdyBeVlgf+sd4sRt4vQQmdNsciPrM=; b=tOn5zlyTagENh9wf7jaXUoJP0AofG/aqN69IZaBqSfInUSE+S2oaYA+fH8CBtwhZcIej+J fIVUMLbgyAa6IFqNyCIQIgmbKc2yCDjE2nvbIlALLYnXILGj22fpEBkX0bPRTgunZ7/5CB zpTgCgCsduPV90RK0cCz+s9VHRLveNZCwMVoZ4wmK6mrq/SGGn3PCRgJf0ihE8ALYhSu3G yEkIuZcryN55EaLvTv0Xp18IVvHTrXcxrIW7aIUT4imyEz+dnl5LigRfJSNSJsaSAzv0bi gpCkTG+lWDAQtRWTzCtpfokV3NxLQKflJjy/MkW8aIixbOsjIKnm0yRZjrfZpw== 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 4WlmWy6sVSz1BRR; Fri, 16 Aug 2024 15:44:46 +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 47GFikjv095916; Fri, 16 Aug 2024 15:44:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47GFikHH095913; Fri, 16 Aug 2024 15:44:46 GMT (envelope-from git) Date: Fri, 16 Aug 2024 15:44:46 GMT Message-Id: <202408161544.47GFikHH095913@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dimitry Andric Subject: git: 52a101b577a5 - 2024Q3 - devel/simdjson: fix build with clang 19 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: 52a101b577a5d2987dd7d8010cdfd20fac687d1d Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=52a101b577a5d2987dd7d8010cdfd20fac687d1d commit 52a101b577a5d2987dd7d8010cdfd20fac687d1d Author: Dimitry Andric AuthorDate: 2024-08-03 13:58:40 +0000 Commit: Dimitry Andric CommitDate: 2024-08-16 15:43:50 +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 (cherry picked from commit 8c86705f8b3cead5d81271a071c331b619da4b8b) --- 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: