Date: Sun, 1 Sep 2019 06:09:51 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r510679 - in head/devel/spdlog: . files Message-ID: <201909010609.x8169p7k034579@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Sun Sep 1 06:09:51 2019 New Revision: 510679 URL: https://svnweb.freebsd.org/changeset/ports/510679 Log: devel/spdlog: Use system fmt This is in preparation for updating devel/libfmt to 6.0.0. Spdlog bundles fmt 5.3.0 which is incompatible with 6.0.0. This would lead to problems in consumers that use both. PR: 240148 Submitted by: jbeich Approved by: vanilla (maintainer) Added: head/devel/spdlog/files/ head/devel/spdlog/files/patch-system-fmt (contents, props changed) Modified: head/devel/spdlog/Makefile head/devel/spdlog/distinfo head/devel/spdlog/pkg-plist Modified: head/devel/spdlog/Makefile ============================================================================== --- head/devel/spdlog/Makefile Sun Sep 1 06:08:25 2019 (r510678) +++ head/devel/spdlog/Makefile Sun Sep 1 06:09:51 2019 (r510679) @@ -3,20 +3,32 @@ PORTNAME= spdlog PORTVERSION= 1.3.1 -PORTREVISION= 1 DISTVERSIONPREFIX= v +PORTREVISION= 2 CATEGORIES= devel +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= b693d0cd915c.patch:-p1 + MAINTAINER= vanilla@FreeBSD.org 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/*.h.orig .include <bsd.port.mk> Modified: head/devel/spdlog/distinfo ============================================================================== --- head/devel/spdlog/distinfo Sun Sep 1 06:08:25 2019 (r510678) +++ head/devel/spdlog/distinfo Sun Sep 1 06:09:51 2019 (r510679) @@ -1,3 +1,5 @@ TIMESTAMP = 1548833457 SHA256 (gabime-spdlog-v1.3.1_GH0.tar.gz) = 160845266e94db1d4922ef755637f6901266731c4cb3b30b45bf41efa0e6ab70 SIZE (gabime-spdlog-v1.3.1_GH0.tar.gz) = 202634 +SHA256 (b693d0cd915c.patch) = a0dedc0dd6defe12dcd7f66a85da7ed0be6c0dad302515e8d832d904979be22e +SIZE (b693d0cd915c.patch) = 750 Added: head/devel/spdlog/files/patch-system-fmt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/spdlog/files/patch-system-fmt Sun Sep 1 06:09:51 2019 (r510679) @@ -0,0 +1,34 @@ +- Only allow system fmtlib usage +- Preserve header-only API with system fmtlib + +--- include/spdlog/fmt/fmt.h.orig 2019-01-18 10:13:07 UTC ++++ include/spdlog/fmt/fmt.h +@@ -10,13 +10,13 @@ + // By default spdlog include its own copy. + // + +-#if !defined(SPDLOG_FMT_EXTERNAL) + #ifndef FMT_HEADER_ONLY + #define FMT_HEADER_ONLY + #endif + #ifndef FMT_USE_WINDOWS_H + #define FMT_USE_WINDOWS_H 0 + #endif ++#if 0 //!defined(SPDLOG_FMT_EXTERNAL) + #include "bundled/core.h" + #include "bundled/format.h" + #else // external fmtlib +--- include/spdlog/fmt/ostr.h.orig 2019-01-18 10:13:07 UTC ++++ include/spdlog/fmt/ostr.h +@@ -7,10 +7,10 @@ + // + // include bundled or external copy of fmtlib's ostream support + // +-#if !defined(SPDLOG_FMT_EXTERNAL) + #ifndef FMT_HEADER_ONLY + #define FMT_HEADER_ONLY + #endif ++#if 0 //!defined(SPDLOG_FMT_EXTERNAL) + #include "bundled/ostream.h" + #include "fmt.h" + #else Modified: head/devel/spdlog/pkg-plist ============================================================================== --- head/devel/spdlog/pkg-plist Sun Sep 1 06:08:25 2019 (r510678) +++ head/devel/spdlog/pkg-plist Sun Sep 1 06:09:51 2019 (r510679) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909010609.x8169p7k034579>