commit: cb284f45ae45e18238ee5395c871d5e200c3d2aa Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> AuthorDate: Thu Oct 30 18:48:47 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 31 04:41:26 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb284f45
sys-cluster/mpich: fix test double serializer; drop non-tree dep Closes: https://bugs.gentoo.org/928317 Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> Part-of: https://github.com/gentoo/gentoo/pull/44391 Closes: https://github.com/gentoo/gentoo/pull/44391 Signed-off-by: Sam James <sam <AT> gentoo.org> .../mpich-3.4.3_fix_test_double_serializer.patch | 26 ++++++++++++++++++++++ sys-cluster/mpich/mpich-3.4.3-r1.ebuild | 7 +++--- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/sys-cluster/mpich/files/mpich-3.4.3_fix_test_double_serializer.patch b/sys-cluster/mpich/files/mpich-3.4.3_fix_test_double_serializer.patch new file mode 100644 index 000000000000..fe735df2bf0a --- /dev/null +++ b/sys-cluster/mpich/files/mpich-3.4.3_fix_test_double_serializer.patch @@ -0,0 +1,26 @@ +Upstream json-c patch with modified path +Mpich upstream issue: https://github.com/pmodels/mpich/issues/7130 +Gentoo issue: https://bugs.gentoo.org/928317 + +From 79ad1c9b9fcc846e6bc31f47b801d11ba6d8613a Mon Sep 17 00:00:00 2001 +From: Björn Esser <[email protected]> +Date: Mon, 18 May 2020 11:38:36 +0200 +Subject: [PATCH] tests: Fix test_double_serializer without thread-local + storage. + +--- + tests/test_double_serializer.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/test_double_serializer.c b/tests/test_double_serializer.c +index bad7ef559e..53727eb856 100644 +--- a/modules/json-c/tests/test_double_serializer.c ++++ b/modules/json-c/tests/test_double_serializer.c +@@ -58,6 +58,7 @@ int main() + #else + // Just fake it up, so the output matches. + printf("obj.to_string(with thread format)=%s\n", "T0.52X"); ++ printf("obj.to_string(long thread format)=%s\n", "Ttttttttttttt0.52xxxxxxxxxxxxxxxxxxX"); + printf("obj.to_string(back to global format)=%s\n", "x0.524y"); + #endif + if (json_c_set_serialization_double_format(NULL, JSON_C_OPTION_GLOBAL) < 0) diff --git a/sys-cluster/mpich/mpich-3.4.3-r1.ebuild b/sys-cluster/mpich/mpich-3.4.3-r1.ebuild index e1b9c50cfe66..88e3775b4bba 100644 --- a/sys-cluster/mpich/mpich-3.4.3-r1.ebuild +++ b/sys-cluster/mpich/mpich-3.4.3-r1.ebuild @@ -34,7 +34,6 @@ DEPEND=" " RDEPEND=" ${COMMON_DEPEND} - !sys-cluster/mpich2 !sys-cluster/openmpi !sys-cluster/nullmpi " @@ -45,9 +44,9 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/opa_config.h ) -#PATCHES=( -# "${FILESDIR}"/${PN}-3.3-add-external-libdir-parameter.patch -#) +PATCHES=( + "${FILESDIR}"/${P}_fix_test_double_serializer.patch +) src_prepare() { default
