gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-libs/yyjson: fix for clang 16 + valgrind

Browse Source 
Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
This commit is contained in:
Viorel Munteanu
2023-08-15 10:59:31 +03:00
parent 774a34c2c1
commit 38ce591f8f
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dev-libs/yyjson/files/yyjson-0.7.0-fix-clang-16-valgrind.patch Normal file
View File

@@ -0,0 +1,24 @@
https://github.com/ibireme/yyjson/commit/841a8c5603a1e393d95300a55b44ebc324497e82
From: ibireme <ibireme@gmail.com>
Date: Mon, 14 Aug 2023 21:33:31 +0800
Subject: [PATCH] Fix clang-16 valgrind fail: #134
--- a/src/yyjson.c
+++ b/src/yyjson.c
@@ -2670,6 +2670,7 @@ yyjson_mut_val *yyjson_merge_patch(yyjson_mut_doc *doc,
builder = yyjson_mut_obj(doc);
if (unlikely(!builder)) return NULL;
+ memset(&local_orig, 0, sizeof(local_orig));
if (!yyjson_is_obj(orig)) {
orig = &local_orig;
orig->tag = builder->tag;
@@ -2721,6 +2722,7 @@ yyjson_mut_val *yyjson_mut_merge_patch(yyjson_mut_doc *doc,
builder = yyjson_mut_obj(doc);
if (unlikely(!builder)) return NULL;
+ memset(&local_orig, 0, sizeof(local_orig));
if (!yyjson_mut_is_obj(orig)) {
orig = &local_orig;
orig->tag = builder->tag;

8
dev-libs/yyjson/yyjson-0.7.0.ebuild → dev-libs/yyjson/yyjson-0.7.0-r1.ebuild
View File

@@ -19,15 +19,17 @@ RESTRICT="!test? ( test )"
BDEPEND="doc? ( app-doc/doxygen )"
PATCHES=( "${FILESDIR}"/${PN}-0.7.0-disable-werror.patch )
PATCHES=(
"${FILESDIR}"/${PN}-0.7.0-disable-werror.patch
"${FILESDIR}"/${PN}-0.7.0-fix-clang-16-valgrind.patch
)
src_configure() {
local mycmakeargs=(
-DYYJSON_BUILD_DOC=$(usex doc)
-DYYJSON_BUILD_TESTS=$(usex test)
-DYYJSON_ENABLE_VALGRIND=$(usex test)
)
# TODO: -DYYJSON_ENABLE_VALGRIND=$(usex test)
# https://github.com/ibireme/yyjson/issues/134
cmake_src_configure
}