diff options
| -rw-r--r-- | dev-libs/dynolog/dynolog-0.3.1_p20230126-r2.ebuild | 1 | ||||
| -rw-r--r-- | dev-libs/dynolog/files/dynolog-0.3.1_p20230126-libcxx.patch | 13 |
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. |