Date: Wed, 4 Dec 2019 13:19:05 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r519012 - in head: databases/tiledb devel/spdlog devel/spdlog/files net-im/nheko sysutils/lizardfs www/envoy www/envoy/files Message-ID: <201912041319.xB4DJ5cD019834@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Wed Dec 4 13:19:05 2019 New Revision: 519012 URL: https://svnweb.freebsd.org/changeset/ports/519012 Log: 1: Update devel/spdlog to 1.4.2. 2: Fix build issue due spdlog's upgrade. Approved by: danfe@ (www/envoy), adridg@ (net-im/nheko), maintainer timeout (sunpoet@, jhixson@) Added: head/www/envoy/files/patch-source_common_common_logger.cc (contents, props changed) Deleted: head/devel/spdlog/files/ Modified: head/databases/tiledb/Makefile head/devel/spdlog/Makefile head/devel/spdlog/distinfo head/devel/spdlog/pkg-plist head/net-im/nheko/Makefile head/sysutils/lizardfs/Makefile head/www/envoy/Makefile head/www/envoy/files/makefile-main Modified: head/databases/tiledb/Makefile ============================================================================== --- head/databases/tiledb/Makefile Wed Dec 4 12:41:24 2019 (r519011) +++ head/databases/tiledb/Makefile Wed Dec 4 13:19:05 2019 (r519012) @@ -3,7 +3,7 @@ PORTNAME= tiledb PORTVERSION= 1.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MAINTAINER= sunpoet@FreeBSD.org @@ -15,16 +15,19 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${RUN_DEPENDS} LIB_DEPENDS= liblz4.so:archivers/liblz4 \ libtbb.so:devel/tbb \ + libfmt.so:devel/libfmt \ libzstd.so:archivers/zstd RUN_DEPENDS= catch>=0:devel/catch \ clipp>=0:devel/clipp \ - spdlog>=0:devel/spdlog + spdlog>=1.4:devel/spdlog USES= cmake compiler:c++11-lang ssl 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 TILEDB_WERROR CMAKE_ON= TILEDB_CPP_API TILEDB_STATIC TILEDB_STATS TILEDB_TBB TILEDB_TBB_SHARED TILEDB_TESTS TILEDB_TOOLS +CFLAGS+= -DSPDLOG_FMT_EXTERNAL=1 +LDFLAGS+= -L${LOCALBASE}/lib -lfmt GH_ACCOUNT= TileDB-Inc GH_PROJECT= TileDB Modified: head/devel/spdlog/Makefile ============================================================================== --- head/devel/spdlog/Makefile Wed Dec 4 12:41:24 2019 (r519011) +++ head/devel/spdlog/Makefile Wed Dec 4 13:19:05 2019 (r519012) @@ -2,13 +2,9 @@ # $FreeBSD$ PORTNAME= spdlog -PORTVERSION= 1.3.1 +PORTVERSION= 1.4.2 DISTVERSIONPREFIX= v -PORTREVISION= 3 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 Modified: head/devel/spdlog/distinfo ============================================================================== --- head/devel/spdlog/distinfo Wed Dec 4 12:41:24 2019 (r519011) +++ head/devel/spdlog/distinfo Wed Dec 4 13:19:05 2019 (r519012) @@ -1,5 +1,3 @@ -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 +TIMESTAMP = 1574572835 +SHA256 (gabime-spdlog-v1.4.2_GH0.tar.gz) = 821c85b120ad15d87ca2bc44185fa9091409777c756029125a02f81354072157 +SIZE (gabime-spdlog-v1.4.2_GH0.tar.gz) = 260262 Modified: head/devel/spdlog/pkg-plist ============================================================================== --- head/devel/spdlog/pkg-plist Wed Dec 4 12:41:24 2019 (r519011) +++ head/devel/spdlog/pkg-plist Wed Dec 4 13:19:05 2019 (r519012) @@ -1,44 +1,70 @@ include/spdlog/async.h include/spdlog/async_logger.h +include/spdlog/async_logger-inl.h include/spdlog/common.h -include/spdlog/details/async_logger_impl.h +include/spdlog/common-inl.h +include/spdlog/details/backtracer-inl.h +include/spdlog/details/backtracer.h include/spdlog/details/circular_q.h include/spdlog/details/console_globals.h include/spdlog/details/file_helper.h +include/spdlog/details/file_helper-inl.h include/spdlog/details/fmt_helper.h include/spdlog/details/log_msg.h -include/spdlog/details/logger_impl.h +include/spdlog/details/log_msg-inl.h +include/spdlog/details/log_msg_buffer-inl.h +include/spdlog/details/log_msg_buffer.h include/spdlog/details/mpmc_blocking_q.h include/spdlog/details/null_mutex.h include/spdlog/details/os.h +include/spdlog/details/os-inl.h include/spdlog/details/pattern_formatter.h +include/spdlog/details/pattern_formatter-inl.h include/spdlog/details/periodic_worker.h +include/spdlog/details/periodic_worker-inl.h include/spdlog/details/registry.h +include/spdlog/details/registry-inl.h +include/spdlog/details/synchronous_factory.h include/spdlog/details/thread_pool.h +include/spdlog/details/thread_pool-inl.h include/spdlog/fmt/bin_to_hex.h include/spdlog/fmt/fmt.h include/spdlog/fmt/ostr.h include/spdlog/formatter.h include/spdlog/logger.h +include/spdlog/logger-inl.h include/spdlog/sinks/android_sink.h include/spdlog/sinks/ansicolor_sink.h +include/spdlog/sinks/ansicolor_sink-inl.h include/spdlog/sinks/base_sink.h +include/spdlog/sinks/base_sink-inl.h include/spdlog/sinks/basic_file_sink.h +include/spdlog/sinks/basic_file_sink-inl.h include/spdlog/sinks/daily_file_sink.h include/spdlog/sinks/dist_sink.h +include/spdlog/sinks/dup_filter_sink.h include/spdlog/sinks/msvc_sink.h include/spdlog/sinks/null_sink.h include/spdlog/sinks/ostream_sink.h include/spdlog/sinks/rotating_file_sink.h +include/spdlog/sinks/rotating_file_sink-inl.h include/spdlog/sinks/sink.h +include/spdlog/sinks/sink-inl.h include/spdlog/sinks/stdout_color_sinks.h +include/spdlog/sinks/stdout_color_sinks-inl.h include/spdlog/sinks/stdout_sinks.h +include/spdlog/sinks/stdout_sinks-inl.h include/spdlog/sinks/syslog_sink.h +include/spdlog/sinks/systemd_sink.h include/spdlog/sinks/wincolor_sink.h +include/spdlog/sinks/wincolor_sink-inl.h include/spdlog/spdlog.h +include/spdlog/spdlog-inl.h include/spdlog/tweakme.h include/spdlog/version.h -lib/cmake/spdlog/spdlogConfig.cmake -lib/cmake/spdlog/spdlogConfigVersion.cmake -lib/cmake/spdlog/spdlogTargets.cmake +lib/libspdlog.a +lib/spdlog/cmake/spdlogConfig.cmake +lib/spdlog/cmake/spdlogConfigTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/spdlog/cmake/spdlogConfigTargets.cmake +lib/spdlog/cmake/spdlogConfigVersion.cmake libdata/pkgconfig/spdlog.pc Modified: head/net-im/nheko/Makefile ============================================================================== --- head/net-im/nheko/Makefile Wed Dec 4 12:41:24 2019 (r519011) +++ head/net-im/nheko/Makefile Wed Dec 4 13:19:05 2019 (r519012) @@ -3,7 +3,7 @@ PORTNAME= nheko DISTVERSIONPREFIX=v DISTVERSION= 0.6.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-im MAINTAINER= adridg@FreeBSD.org @@ -13,8 +13,9 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= nlohmann-json>=3:devel/nlohmann-json \ - spdlog>=1.3:devel/spdlog + spdlog>=1.4:devel/spdlog LIB_DEPENDS= liblmdb.so:databases/lmdb \ + libfmt.so:devel/libfmt \ libmatrix_client.so:net-im/mtxclient \ libsodium.so:security/libsodium \ libolm.so:security/olm \ @@ -32,6 +33,8 @@ USE_QT= concurrent core dbus declarative gui multimed # in include/. Add one more symlink to the build for that. CMAKE_ARGS= -DLMDBXX_INCLUDE_DIR=${WRKSRC}/deps/lmdb \ -DTWEENY_INCLUDE_DIR=${WRKSRC}/deps/tweeny +CFLAGS+= -DSPDLOG_FMT_EXTERNAL=1 +LDFLAGS+= -L${LOCALBASE}/lib -lfmt USE_GITHUB= yes GH_ACCOUNT= Nheko-Reborn Modified: head/sysutils/lizardfs/Makefile ============================================================================== --- head/sysutils/lizardfs/Makefile Wed Dec 4 12:41:24 2019 (r519011) +++ head/sysutils/lizardfs/Makefile Wed Dec 4 13:19:05 2019 (r519012) @@ -4,7 +4,7 @@ PORTNAME= lizardfs PORTVERSION= 3.12.0 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= jhixson@FreeBSD.org @@ -14,8 +14,9 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= a2x:textproc/asciidoc \ - spdlog>=1.3.0:devel/spdlog -LIB_DEPENDS= libboost_system.so:devel/boost-libs + spdlog>=1.4.2:devel/spdlog +LIB_DEPENDS= libboost_system.so:devel/boost-libs \ + libfmt.so:devel/libfmt USES= cmake compiler:c11 fuse python shebangfix USE_RC_SUBR= mfscgiserv \ @@ -37,6 +38,8 @@ SHEBANG_FILES= src/cgi/cgiserv.py.in \ USE_GITHUB= yes USE_LDCONFIG= yes +CFLAGS+= -DSPDLOG_FMT_EXTERNAL=1 +LDFLAGS+= -L${LOCALBASE}/lib -lfmt CMAKE_BUILD_TYPE= Release CMAKE_ARGS= -DMAN_SUBDIR=man \ -DENABLE_WERROR=OFF \ Modified: head/www/envoy/Makefile ============================================================================== --- head/www/envoy/Makefile Wed Dec 4 12:41:24 2019 (r519011) +++ head/www/envoy/Makefile Wed Dec 4 13:19:05 2019 (r519012) @@ -23,6 +23,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/absl/base/thread_a ${LOCALBASE}/include/tclap/CmdLine.h:devel/tclap LIB_DEPENDS= libcircllhist.so:devel/libcircllhist \ libevent.so:devel/libevent \ + libfmt.so:devel/libfmt \ libgpr.so:devel/grpc \ libprotobuf.so:devel/protobuf \ libxxhash.so:devel/xxhash \ Modified: head/www/envoy/files/makefile-main ============================================================================== --- head/www/envoy/files/makefile-main Wed Dec 4 12:41:24 2019 (r519011) +++ head/www/envoy/files/makefile-main Wed Dec 4 13:19:05 2019 (r519012) @@ -1,12 +1,12 @@ # $FreeBSD$ LOCALBASE?= /usr/local -CXXFLAGS+= -std=c++14 -Wall -Wextra -Wno-unused-parameter +CXXFLAGS+= -std=c++14 -Wall -Wextra -Wno-unused-parameter -DSPDLOG_FMT_EXTERNAL=1 CPPFLAGS+= -I. -I../include -I../api -I$(LOCALBASE)/include \ -DNDEBUG -DENVOY_SSL_VERSION=\"BoringSSL\" \ -DBUILD_SCM_REVISION=\"e95ef6b\" \ -DBUILD_SCM_STATUS=\"Modified\" -LDFLAGS+= -L$(LOCALBASE)/lib +LDFLAGS+= -L$(LOCALBASE)/lib -lfmt CCACHE?= $(shell command -v ccache) api_OBJS= ../api/envoy/admin/v2alpha/certs.pb.o \ Added: head/www/envoy/files/patch-source_common_common_logger.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/envoy/files/patch-source_common_common_logger.cc Wed Dec 4 13:19:05 2019 (r519012) @@ -0,0 +1,11 @@ +--- source/common/common/logger.cc.orig 2019-11-24 23:36:11.089013000 +0800 ++++ source/common/common/logger.cc 2019-11-24 23:36:22.474417000 +0800 +@@ -61,7 +61,7 @@ void DelegatingLogSink::log(const spdlog::details::log + return; + } + +- fmt::memory_buffer formatted; ++ spdlog::memory_buf_t formatted; + formatter_->format(msg, formatted); + lock.Release(); + sink_->log(absl::string_view(formatted.data(), formatted.size()));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912041319.xB4DJ5cD019834>