From 4b13ae9dc2062835b682f2ee7cf979811f478f68 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Tue, 9 Jun 2020 22:35:53 +0200 Subject: [PATCH] - fix building with spdlog 1.x --- lizardfs.spec | 4 +++- spdlog-1.patch | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 spdlog-1.patch diff --git a/lizardfs.spec b/lizardfs.spec index 5008893..086aa84 100644 --- a/lizardfs.spec +++ b/lizardfs.spec @@ -17,6 +17,7 @@ Source2: %{name}-chunkserver.service Patch0: system-spdlog.patch Patch1: x32.patch Patch2: 0001-Add-missing-header.patch +Patch3: spdlog-1.patch URL: https://github.com/lizardfs/lizardfs BuildRequires: /usr/bin/a2x BuildRequires: asciidoc @@ -33,7 +34,7 @@ BuildRequires: judy-devel BuildRequires: libfuse-devel BuildRequires: pkgconfig BuildRequires: rpmbuild(macros) >= 1.647 -BuildRequires: spdlog-devel >= 0.14.0 +BuildRequires: spdlog-devel >= 1.12-2 BuildRequires: zlib-devel Requires(post,preun,postun): systemd-units >= 38 Requires(postun): /usr/sbin/groupdel @@ -94,6 +95,7 @@ CGI server %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %{__rm} -r external/crcutil-1.0 diff --git a/spdlog-1.patch b/spdlog-1.patch new file mode 100644 index 0000000..c523bac --- /dev/null +++ b/spdlog-1.patch @@ -0,0 +1,11 @@ +--- lizardfs-3.12.0/src/common/slogger.cc~ 2017-12-20 10:59:37.000000000 +0100 ++++ lizardfs-3.12.0/src/common/slogger.cc 2020-06-09 22:20:57.067884728 +0200 +@@ -97,7 +97,7 @@ + + bool lzfs::add_log_stderr(log_level::LogLevel level) { + try { +- LoggerPtr logger = spdlog::stderr_color_mt("stderr"); ++ LoggerPtr logger = spdlog::stderr_logger_mt("stderr", true); + logger->set_level((spdlog::level::level_enum)level); + // Format: DATE TIME [LEVEL] [PID:TID] : MESSAGE + logger->set_pattern("%D %H:%M:%S.%e [%l] [%P:%t] : %v"); -- 2.44.0