diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-08-02 19:14:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-08-02 19:14:55 +0100 |
commit | b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch) | |
tree | 0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /dev-libs/spdlog/files | |
parent | 121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff) |
gentoo resync : 02.08.2019
Diffstat (limited to 'dev-libs/spdlog/files')
-rw-r--r-- | dev-libs/spdlog/files/spdlog-9999-unbundle-fmt.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/dev-libs/spdlog/files/spdlog-9999-unbundle-fmt.patch b/dev-libs/spdlog/files/spdlog-9999-unbundle-fmt.patch new file mode 100644 index 000000000000..f6f37b5e493c --- /dev/null +++ b/dev-libs/spdlog/files/spdlog-9999-unbundle-fmt.patch @@ -0,0 +1,45 @@ +diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h +index 5d039b8c..8107b19a 100644 +--- a/include/spdlog/fmt/fmt.h ++++ b/include/spdlog/fmt/fmt.h +@@ -19,9 +19,6 @@ + #ifndef FMT_USE_WINDOWS_H + #define FMT_USE_WINDOWS_H 0 + #endif +-#include "bundled/core.h" +-#include "bundled/format.h" +-#else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib +-#include "fmt/core.h" +-#include "fmt/format.h" +-#endif ++#endif // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib ++#include <fmt/core.h> ++#include <fmt/format.h> +diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h +index 9902898f..5e92a592 100644 +--- a/include/spdlog/fmt/ostr.h ++++ b/include/spdlog/fmt/ostr.h +@@ -11,8 +11,6 @@ + #ifndef FMT_HEADER_ONLY + #define FMT_HEADER_ONLY + #endif +-#include "bundled/ostream.h" +-#include "fmt.h" +-#else +-#include <fmt/ostream.h> + #endif ++ ++#include <fmt/ostream.h> +diff --git a/src/spdlog.cpp b/src/spdlog.cpp +index be91412d..d68dd522 100644 +--- a/src/spdlog.cpp ++++ b/src/spdlog.cpp +@@ -104,7 +104,7 @@ template std::shared_ptr<spdlog::logger> spdlog::stderr_logger_st<spdlog::async_ + // All rights reserved. + + #if !defined(SPDLOG_FMT_EXTERNAL) +-#include "spdlog/fmt/bundled/format-inl.h" ++#include <fmt/format-inl.h> + + FMT_BEGIN_NAMESPACE + template struct internal::basic_data<void>; |