summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSv. Lockal <lockalsash@gmail.com>2024-08-08 03:38:09 +0000
committerAlfredo Tupone <tupone@gentoo.org>2024-08-08 18:22:25 +0200
commit9560300b7a9c4572a3147f3f409aacb4d98a6196 (patch)
tree48bee0a8aa019fd1c7e2fbd553ca301fd1bdca90 /dev-libs/dynolog
parentsci-libs/kineto: add 0.4.0_p20240525 (diff)
downloadgentoo-9560300b7a9c4572a3147f3f409aacb4d98a6196.tar.gz
gentoo-9560300b7a9c4572a3147f3f409aacb4d98a6196.tar.bz2
gentoo-9560300b7a9c4572a3147f3f409aacb4d98a6196.zip
dev-libs/dynolog: fix compilation with libc++
Signed-off-by: Sv. Lockal <lockalsash@gmail.com> Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
Diffstat (limited to 'dev-libs/dynolog')
-rw-r--r--dev-libs/dynolog/dynolog-0.3.1_p20230126-r2.ebuild1
-rw-r--r--dev-libs/dynolog/files/dynolog-0.3.1_p20230126-libcxx.patch13
2 files changed, 14 insertions, 0 deletions
diff --git a/dev-libs/dynolog/dynolog-0.3.1_p20230126-r2.ebuild b/dev-libs/dynolog/dynolog-0.3.1_p20230126-r2.ebuild
index 806fe0946869..0df5a58659f9 100644
--- a/dev-libs/dynolog/dynolog-0.3.1_p20230126-r2.ebuild
+++ b/dev-libs/dynolog/dynolog-0.3.1_p20230126-r2.ebuild
@@ -71,6 +71,7 @@ PATCHES=(
"${FILESDIR}"/${P}-noWerror.patch
"${FILESDIR}"/${P}-riscv.patch
"${FILESDIR}"/${P}-musl.patch
+ "${FILESDIR}"/${P}-libcxx.patch
)
CMAKE_SKIP_TESTS=( "Defs.CpuSet" "KernelCollecterTest.NetworkStatsTest" )
diff --git a/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-libcxx.patch b/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-libcxx.patch
new file mode 100644
index 000000000000..64e51ae8c633
--- /dev/null
+++ b/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-libcxx.patch
@@ -0,0 +1,13 @@
+dynolog mixes high_resolution_clock with system_clock, which is not allowed
+Upstream PR: https://github.com/facebookincubator/dynolog/pull/276
+--- a/hbt/src/common/Defs.h
++++ b/hbt/src/common/Defs.h
+@@ -40,7 +40,7 @@ template <class TStream>
+ TStream& LogCtxt(TStream& oss) {
+ oss << "pid: " << gettid() << " on ";
+ // Put date and time.
+- auto p = std::chrono::high_resolution_clock::now();
++ auto p = std::chrono::system_clock::now();
+ auto t_c = std::chrono::system_clock::to_time_t(p);
+ oss << std::put_time(std::localtime(&t_c), "%F %T");
+ // Put microseconds.