diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-08-15 12:15:20 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-08-15 12:15:20 +0100 |
| commit | 4f064d2f2d61a575a6e418623bd2dc3c8599ad13 (patch) | |
| tree | b4969a550417293bfcb239af37c68d8578a706a6 /dev-libs/yyjson | |
| parent | 78f392693b4d21958c3f9e73171c7c65cb437bb5 (diff) | |
gentoo auto-resync : 15:08:2023 - 12:15:20
Diffstat (limited to 'dev-libs/yyjson')
| -rw-r--r-- | dev-libs/yyjson/Manifest | 3 | ||||
| -rw-r--r-- | dev-libs/yyjson/files/yyjson-0.7.0-fix-clang-16-valgrind.patch | 24 | ||||
| -rw-r--r-- | dev-libs/yyjson/yyjson-0.7.0-r1.ebuild (renamed from dev-libs/yyjson/yyjson-0.7.0.ebuild) | 8 |
3 files changed, 31 insertions, 4 deletions
diff --git a/dev-libs/yyjson/Manifest b/dev-libs/yyjson/Manifest index c755db3150c9..a09c2f717ae0 100644 --- a/dev-libs/yyjson/Manifest +++ b/dev-libs/yyjson/Manifest @@ -1,4 +1,5 @@ AUX yyjson-0.7.0-disable-werror.patch 303 BLAKE2B 18a7ed6a7a054be4a89a42597926ff7ed5bd1f0ed0e5cb51287d1e43b507f7d7781f9ba78d4942fc1381b8f2dc0bbeac9ec106a9b8e8a2e461d6a6993af52056 SHA512 59e91c71eb214c0e2579a0c170199ed26f6f9bbce3cf110653fafbfe059743033948108d3d895b11bd4d43d05881d13e446981a6711b22107909e3d4647be739 +AUX yyjson-0.7.0-fix-clang-16-valgrind.patch 868 BLAKE2B 6b9e58a5a0abcaf5de88d2dd124d2fdf93221a9a58437bfbfbee648b5d21413f8b6438078a54f6088bec59f3c69bbb20d5b0d7758c63bb09f74b9b66da5202d9 SHA512 73acc350a96033faad1df048ee12d39284f7f02575ed25b8f696c746ca99b45833f9211d8e87e86e88040168d742c5196949be874780ee0de448355e5bb1df5e DIST yyjson-0.7.0.tar.gz 1511395 BLAKE2B a088ecaf049b4fd5562a15759dfb67e5a1612ca848a658898bf7b9fe2e8bf7df1270d2a4fe477a92df8963065fb60ce5dbf69da5eb7fa1e282f821222329032d SHA512 91a14d2292cebc5d3eb0954511c1d27d6fa45f778febe73bac700acdbeba3bfc485db444d49cab903dc323eacdb74625059465e4a45a1eca5a1e397768f422f5 -EBUILD yyjson-0.7.0.ebuild 862 BLAKE2B 03284da9257936cb3e37686e0cdf22617614848abf20ea11cb2cbd1a6c8c375d842d09b03ccb90e1a98426fb4d788a365a6e6ea5e4914644d74359fc292feeee SHA512 97069b6f7036e0c72b7e4a172521d2aa87ee0527fb8b65679c4923f11cdbdfb030730cedf8a18917717730ba5950f60dcd405468a27e78b4a8d8889c8d72ebf5 +EBUILD yyjson-0.7.0-r1.ebuild 863 BLAKE2B a0e7216e7de4ca9befa83c74c8e74cfbd104a6f6a0ca53ff0bcc9bc4ca51868541988ba1445eb02c1f5e06c4e027051840fbcd9bc168f967aaa6c5db03b7c1d8 SHA512 96124d17ff2779d48b9700e8dca18955ea3906c428ef39f9a535b3fc1a0f3382fa1c7901a583c8b92c4d300ae56b5565af693d5b21d67021e6c51c1cb48d5579 MISC metadata.xml 297 BLAKE2B a5ac4375cfb73215475fbcdc7dcfd5edde21a0696761230679afa8ca7cbd520a684b6b96641d8c61104dc3dbde5d9ac9fd66a24c217aced8a6bcce79fd9926c6 SHA512 2c347d6f55a7e970387ca0e30c2064e53e64eb64ef2e7b615bca747fd83834064fd7ae1566a9353f5eedc32c606aca1f425b13573b8fe5c519c6cca2c4b4e495 diff --git a/dev-libs/yyjson/files/yyjson-0.7.0-fix-clang-16-valgrind.patch b/dev-libs/yyjson/files/yyjson-0.7.0-fix-clang-16-valgrind.patch new file mode 100644 index 000000000000..33a1ceee5a26 --- /dev/null +++ b/dev-libs/yyjson/files/yyjson-0.7.0-fix-clang-16-valgrind.patch @@ -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; diff --git a/dev-libs/yyjson/yyjson-0.7.0.ebuild b/dev-libs/yyjson/yyjson-0.7.0-r1.ebuild index 30376e8e222a..506382b3e617 100644 --- a/dev-libs/yyjson/yyjson-0.7.0.ebuild +++ b/dev-libs/yyjson/yyjson-0.7.0-r1.ebuild @@ -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 } |