FreeBSD Bugzilla – Attachment 206981 Details for
Bug 240148
devel/spdlog: unbundle fmtlib or update to 6.0.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
unbundle (like Gentoo)
bug240148.diff (text/plain), 4.08 KB, created by
Jan Beich
on 2019-08-28 17:11:51 UTC
(
hide
)
Description:
unbundle (like Gentoo)
Filename:
MIME Type:
Creator:
Jan Beich
Created:
2019-08-28 17:11:51 UTC
Size:
4.08 KB
patch
obsolete
>From d2532365620628cf236398bb2b7a7539ff456086 Mon Sep 17 00:00:00 2001 >From: Jan Beich <jbeich@FreeBSD.org> >Date: Wed, 28 Aug 2019 15:59:29 +0000 >Subject: [PATCH] devel/spdlog: unbundle libfmt > >PR: 240148 >Approved by: vanilla (maintainer) >--- > databases/tiledb/Makefile | 1 + > devel/spdlog/Makefile | 15 +++++++++++++-- > .../files/patch-include_spdlog_fmt_bin__to__hex.h | 13 +++++++++++++ > devel/spdlog/pkg-plist | 12 ------------ > sysutils/lizardfs/Makefile | 1 + > 5 files changed, 28 insertions(+), 14 deletions(-) > create mode 100644 devel/spdlog/files/patch-include_spdlog_fmt_bin__to__hex.h > >diff --git a/databases/tiledb/Makefile b/databases/tiledb/Makefile >index e023d4afb5bf..d8ae794281f2 100644 >--- a/databases/tiledb/Makefile >+++ b/databases/tiledb/Makefile >@@ -21,6 +21,7 @@ RUN_DEPENDS= catch>=0:devel/catch \ > > USES= cmake compiler:c++11-lang ssl > >+CXXFLAGS+= -DFMT_HEADER_ONLY > CMAKE_ARGS= -DCATCH_INCLUDE_DIR=${LOCALBASE}/include/catch2 > CMAKE_OFF= TILEDB_CMAKE_IDE TILEDB_FORCE_ALL_DEPS TILEDB_HDFS TILEDB_S3 TILEDB_SUPERBUILD TILEDB_TESTS_AWS_S3_CONFIG TILEDB_VERBOSE > CMAKE_ON= TILEDB_CPP_API TILEDB_STATIC TILEDB_STATS TILEDB_TBB TILEDB_TBB_SHARED TILEDB_TESTS TILEDB_TOOLS TILEDB_WERROR >diff --git a/devel/spdlog/Makefile b/devel/spdlog/Makefile >index 256c2fd1cd8b..466b02192d67 100644 >--- a/devel/spdlog/Makefile >+++ b/devel/spdlog/Makefile >@@ -3,8 +3,8 @@ > > PORTNAME= spdlog > PORTVERSION= 1.3.1 >-PORTREVISION= 1 > DISTVERSIONPREFIX= v >+PORTREVISION= 2 > CATEGORIES= devel > > MAINTAINER= vanilla@FreeBSD.org >@@ -13,10 +13,21 @@ COMMENT= Super fast C++ logging library > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >+LIB_DEPENDS= libfmt.so:devel/libfmt >+ > USES= cmake compiler:c++11-lib pathfix > > USE_GITHUB= yes > GH_ACCOUNT= gabime >-CMAKE_ARGS= -DSPDLOG_BUILD_BENCH=off >+CMAKE_ON= SPDLOG_FMT_EXTERNAL >+CMAKE_OFF= SPDLOG_BUILD_BENCH >+ >+post-extract: >+ ${RM} -r ${WRKSRC}/include/spdlog/fmt/bundled >+ >+post-patch: >+ ${RM} ${WRKSRC}/include/spdlog/fmt/bin_to_hex.h.orig >+ ${REINPLACE_CMD} -i '' -e 's,!defined(SPDLOG_FMT_EXTERNAL),0 //&,' \ >+ ${WRKSRC}/include/spdlog/fmt/*.h > > .include <bsd.port.mk> >diff --git a/devel/spdlog/files/patch-include_spdlog_fmt_bin__to__hex.h b/devel/spdlog/files/patch-include_spdlog_fmt_bin__to__hex.h >new file mode 100644 >index 000000000000..0c706596cbd2 >--- /dev/null >+++ b/devel/spdlog/files/patch-include_spdlog_fmt_bin__to__hex.h >@@ -0,0 +1,13 @@ >+https://github.com/gabime/spdlog/issues/1195 >+ >+--- include/spdlog/fmt/bin_to_hex.h.orig 2019-01-18 10:13:07 UTC >++++ include/spdlog/fmt/bin_to_hex.h >+@@ -117,7 +117,7 @@ struct formatter<spdlog::details::bytes_range<T>> >+ >+ std::size_t pos = 0; >+ std::size_t column = line_size; >+- auto inserter = ctx.begin(); >++ auto inserter = ctx.out(); >+ >+ for (auto &item : the_range) >+ { >diff --git a/devel/spdlog/pkg-plist b/devel/spdlog/pkg-plist >index a80d0601fcf7..03ff7eb5cff4 100644 >--- a/devel/spdlog/pkg-plist >+++ b/devel/spdlog/pkg-plist >@@ -16,18 +16,6 @@ include/spdlog/details/periodic_worker.h > include/spdlog/details/registry.h > include/spdlog/details/thread_pool.h > include/spdlog/fmt/bin_to_hex.h >-include/spdlog/fmt/bundled/LICENSE.rst >-include/spdlog/fmt/bundled/chrono.h >-include/spdlog/fmt/bundled/core.h >-include/spdlog/fmt/bundled/color.h >-include/spdlog/fmt/bundled/format-inl.h >-include/spdlog/fmt/bundled/format.h >-include/spdlog/fmt/bundled/locale.h >-include/spdlog/fmt/bundled/ostream.h >-include/spdlog/fmt/bundled/posix.h >-include/spdlog/fmt/bundled/printf.h >-include/spdlog/fmt/bundled/ranges.h >-include/spdlog/fmt/bundled/time.h > include/spdlog/fmt/fmt.h > include/spdlog/fmt/ostr.h > include/spdlog/formatter.h >diff --git a/sysutils/lizardfs/Makefile b/sysutils/lizardfs/Makefile >index 5c32c23eb145..a2e627b0fb3f 100644 >--- a/sysutils/lizardfs/Makefile >+++ b/sysutils/lizardfs/Makefile >@@ -37,6 +37,7 @@ SHEBANG_FILES= src/cgi/cgiserv.py.in \ > USE_GITHUB= yes > USE_LDCONFIG= yes > >+CXXFLAGS+= -DFMT_HEADER_ONLY > CMAKE_BUILD_TYPE= Release > CMAKE_ARGS= -DMAN_SUBDIR=man \ > -DENABLE_WERROR=OFF \
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 240148
:
206981
|
206993