summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Roman <davidroman96@gmail.com>2022-05-06 21:28:37 +0200
committerSam James <sam@gentoo.org>2022-05-11 01:04:00 +0000
commitcc5eb0f1c465faa4d7e4b00efcad2f8feeb020ae (patch)
tree789c0926eed730831a95ed82e0645915116d11e4 /dev-libs/spdlog
parentprofiles/arch/sparc: mask ffmpeg[samba], gvfs[samba], vlc[samba] (diff)
downloadgentoo-cc5eb0f1c465faa4d7e4b00efcad2f8feeb020ae.tar.gz
gentoo-cc5eb0f1c465faa4d7e4b00efcad2f8feeb020ae.tar.bz2
gentoo-cc5eb0f1c465faa4d7e4b00efcad2f8feeb020ae.zip
dev-libs/spdlog: fix clone async test
Closes: https://bugs.gentoo.org/840764 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: David Roman <davidroman96@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/25355 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-libs/spdlog')
-rw-r--r--dev-libs/spdlog/files/spdlog-1.9.2-fix-clone-test.patch13
-rw-r--r--dev-libs/spdlog/spdlog-1.9.2-r1.ebuild5
2 files changed, 17 insertions, 1 deletions
diff --git a/dev-libs/spdlog/files/spdlog-1.9.2-fix-clone-test.patch b/dev-libs/spdlog/files/spdlog-1.9.2-fix-clone-test.patch
new file mode 100644
index 000000000000..a224969d9025
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-1.9.2-fix-clone-test.patch
@@ -0,0 +1,13 @@
+See https://bugs.gentoo.org/840764
+
+--- a/tests/test_misc.cpp
++++ b/tests/test_misc.cpp
+@@ -131,7 +131,7 @@ TEST_CASE("clone async", "[clone]")
+ logger->info("Some message 1");
+ cloned->info("Some message 2");
+
+- spdlog::details::os::sleep_for_millis(10);
++ spdlog::details::os::sleep_for_millis(100);
+
+ REQUIRE(test_sink->lines().size() == 2);
+ REQUIRE(test_sink->lines()[0] == "Some message 1");
diff --git a/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild b/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild
index c8f6d4c67329..d1522c98ebf1 100644
--- a/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild
+++ b/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild
@@ -31,7 +31,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-force_external_fmt.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-force_external_fmt.patch"
+ "${FILESDIR}/${P}-fix-clone-test.patch"
+)
src_prepare() {
use test && eapply "${WORKDIR}"/${P}-update-catch-glibc-2.34.patch