Index: head/databases/tiledb/Makefile =================================================================== --- head/databases/tiledb/Makefile (revision 519011) +++ head/databases/tiledb/Makefile (revision 519012) @@ -1,33 +1,36 @@ # Created by: Po-Chuan Hsieh # $FreeBSD$ PORTNAME= tiledb PORTVERSION= 1.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MAINTAINER= sunpoet@FreeBSD.org COMMENT= TileDB array data management LICENSE= MIT 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 USE_GITHUB= yes .include Index: head/devel/spdlog/files/patch-system-fmt =================================================================== --- head/devel/spdlog/files/patch-system-fmt (revision 519011) +++ head/devel/spdlog/files/patch-system-fmt (nonexistent) @@ -1,34 +0,0 @@ -- 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 Property changes on: head/devel/spdlog/files/patch-system-fmt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/devel/spdlog/Makefile =================================================================== --- head/devel/spdlog/Makefile (revision 519011) +++ head/devel/spdlog/Makefile (revision 519012) @@ -1,34 +1,30 @@ # Created by: vanilla@ # $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 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_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 Index: head/devel/spdlog/distinfo =================================================================== --- head/devel/spdlog/distinfo (revision 519011) +++ head/devel/spdlog/distinfo (revision 519012) @@ -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 Index: head/devel/spdlog/pkg-plist =================================================================== --- head/devel/spdlog/pkg-plist (revision 519011) +++ head/devel/spdlog/pkg-plist (revision 519012) @@ -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 Index: head/net-im/nheko/Makefile =================================================================== --- head/net-im/nheko/Makefile (revision 519011) +++ head/net-im/nheko/Makefile (revision 519012) @@ -1,52 +1,55 @@ # $FreeBSD$ PORTNAME= nheko DISTVERSIONPREFIX=v DISTVERSION= 0.6.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-im MAINTAINER= adridg@FreeBSD.org COMMENT= Matrix IM client based on Qt technologies 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 \ libcmark.so:textproc/cmark USES= cmake compiler:c++17-lang pkgconfig \ localbase:ldflags qt:5 tar:xz USE_QT= concurrent core dbus declarative gui multimedia network svg widgets \ buildtools_build linguist_build qmake_build # There are two external dependencies: lmdb++ and tweeny. # - lmdb++ is a single header file, it just needs to be included # - tweeny is a library, but only one header is needed; it is normally # installed into a tweeny/ subdirectory, but its sources place it # 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 GH_TUPLE= drycpp:lmdbxx:0b43ca87d8cfabba392dfe884eb1edb83874de02:lmdb/deps/lmdb \ mobius3:tweeny:v3:tweeny/deps/tweeny post-extract: cd ${WRKSRC}/deps/tweeny && ${LN} -s include tweeny # Includes without referencing where it's installed, # so hackishly correct all the broken paths. post-patch: ${FIND} ${WRKSRC} -type f -print0 | \ ${XARGS} -0 ${REINPLACE_CMD} \ -e 's+include +include +' \ -e 's+include "json.hpp"+include +' .include Index: head/sysutils/lizardfs/Makefile =================================================================== --- head/sysutils/lizardfs/Makefile (revision 519011) +++ head/sysutils/lizardfs/Makefile (revision 519012) @@ -1,58 +1,61 @@ # Created by: John Hixson # $FreeBSD$ PORTNAME= lizardfs PORTVERSION= 3.12.0 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= jhixson@FreeBSD.org COMMENT= Open Source Distribruted Filesystem 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 \ mfschunkserver \ mfsmaster \ mfsmetalogger \ mfspingserv GH_ACCOUNT= lizardfs USERS= mfs GROUPS= mfs SHEBANG_FILES= src/cgi/cgiserv.py.in \ src/cgi/lizardfs-cgiserver.py.in \ src/cgi/mfs.cgi.in \ src/cgi/chart.cgi.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 \ -DENABLE_LIGHTMFS=ON \ -DENABLE_DEBIAN_PATHS=OFF \ -DENABLE_UTILS=ON \ -DENABLE_TESTS=OFF \ -DENABLE_DOCS=ON \ -DENABLE_VERBOSE_ASCIIDOC=ON \ -DENABLE_TCMALLOC=OFF \ -DENABLE_POLONAISE=OFF \ -DENABLE_CLIENT_LIB=ON \ -DENABLE_URAFT=ON \ -DENABLE_TRACES=OFF \ -DENABLE_CRC=ON \ -DENABLE_REQUEST_LOG=OFF \ -DENABLE_NFS_GANESHA=OFF .include Index: head/www/envoy/Makefile =================================================================== --- head/www/envoy/Makefile (revision 519011) +++ head/www/envoy/Makefile (revision 519012) @@ -1,104 +1,105 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= envoy PORTVERSION= 1.10.0 DISTVERSIONPREFIX= v PORTREVISION= 6 CATEGORIES= www MAINTAINER= danfe@FreeBSD.org COMMENT= Edge and service proxy for cloud-native applications LICENSE= APACHE20 BROKEN_i386= makes a lot of 64-bit assumptions (patches welcome) BROKEN_SSL= base openssl openssl111 libressl libressl-devel BROKEN_SSL_REASON= requires BoringSSL BUILD_DEPENDS= ${LOCALBASE}/include/absl/base/thread_annotations.h:devel/abseil \ ${LOCALBASE}/include/fmt/format.h:devel/libfmt \ ${LOCALBASE}/include/rapidjson/document.h:devel/rapidjson \ ${LOCALBASE}/include/spdlog/spdlog.h:devel/spdlog \ ${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 \ libyaml-cpp.so:devel/yaml-cpp \ libcares.so:dns/c-ares \ libhttp_parser.so:www/http-parser \ libnghttp2.so:www/libnghttp2 USES= compiler:c++14-lang gmake ssl USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME}proxy gogo:protobuf googleapis:gapis \ prometheus:pm grpc:grpc GH_PROJECT= protoc-gen-validate:validate protobuf:protobuf \ googleapis:gapis client_model:pm grpc:grpc GH_TAGNAME= v0.1.0:validate v1.1.1:protobuf b4c73fa:gapis \ fd36f42:pm v1.22.0:grpc PLIST_FILES= bin/envoy PORTEXAMPLES= cors/backend/front-envoy.yaml \ cors/backend/service-envoy.yaml \ cors/frontend/front-envoy.yaml \ cors/frontend/service-envoy.yaml \ front-proxy/front-envoy.yaml \ front-proxy/service-envoy.yaml \ grpc-bridge/config/s2s-grpc-envoy.yaml \ grpc-bridge/config/s2s-python-envoy.yaml \ jaeger-tracing/front-envoy-jaeger.yaml \ jaeger-tracing/service1-envoy-jaeger.yaml \ jaeger-tracing/service2-envoy-jaeger.yaml \ lua/envoy.yaml \ zipkin-tracing/front-envoy-zipkin.yaml \ zipkin-tracing/service1-envoy-zipkin.yaml \ zipkin-tracing/service2-envoy-zipkin.yaml OPTIONS_DEFINE= EXAMPLES post-extract: ${LN} -s ../../client_model-fd36f42/metrics.proto \ ../../googleapis-b4c73fa/google \ ../../grpc-1.22.0/src \ ../../protobuf-1.1.1/gogoproto \ ../../protoc-gen-validate-0.1.0/validate ${WRKSRC}/api post-patch: @${REINPLACE_CMD} -e '//d' \ ${WRKSRC}/source/common/common/byte_order.h @${REINPLACE_CMD} -e 's,__APPLE__,__${OPSYS}__,' \ ${WRKSRC}/source/common/network/address_impl.cc \ ${WRKSRC}/source/common/network/udp_listener_impl.cc @${REINPLACE_CMD} -e 's,O_SYMLINK,O_NOFOLLOW,' \ ${WRKSRC}/source/common/filesystem/kqueue/watcher_impl.cc @${REINPLACE_CMD} -e '/#include/s,\.validate,,' \ ${WRKSRC}/source/extensions/access_loggers/file/config.cc \ ${WRKSRC}/source/server/overload_manager_impl.h do-configure: ${ECHO_CMD} '#define BUILD_VERSION_NUMBER "${PORTVERSION}"' \ > ${WRKSRC}/source/common/common/version_number.h ${LN} -s kqueue/watcher_impl.h posix/filesystem_impl.h \ posix/directory_iterator_impl.h \ ${WRKSRC}/source/common/filesystem ${LN} -s posix/platform_impl.h ${WRKSRC}/source/exe ${LN} -s posix/thread_impl.h ${WRKSRC}/source/common/common do-build: ${MAKE_CMD} -C ${WRKSRC}/api -f ${FILESDIR}/makefile-genproto ${MAKE_CMD} ${_MAKE_JOBS} -C ${WRKSRC}/source \ -f ${FILESDIR}/makefile-main do-install: ${INSTALL_PROGRAM} ${WRKSRC}/source/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${TAR} -cf - -C ${WRKSRC}/examples ${PORTEXAMPLES} | \ ${TAR} -xf - -C ${STAGEDIR}${EXAMPLESDIR} .include Index: head/www/envoy/files/makefile-main =================================================================== --- head/www/envoy/files/makefile-main (revision 519011) +++ head/www/envoy/files/makefile-main (revision 519012) @@ -1,172 +1,172 @@ # $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 \ ../api/envoy/admin/v2alpha/clusters.pb.o \ ../api/envoy/admin/v2alpha/config_dump.pb.o \ ../api/envoy/admin/v2alpha/memory.pb.o \ ../api/envoy/admin/v2alpha/metrics.pb.o \ ../api/envoy/admin/v2alpha/mutex_stats.pb.o \ ../api/envoy/admin/v2alpha/server_info.pb.o \ ../api/envoy/api/v2/auth/cert.pb.o \ ../api/envoy/api/v2/cds.pb.o \ ../api/envoy/api/v2/cluster/circuit_breaker.pb.o \ ../api/envoy/api/v2/cluster/outlier_detection.pb.o \ ../api/envoy/api/v2/core/address.pb.o \ ../api/envoy/api/v2/core/base.pb.o \ ../api/envoy/api/v2/core/config_source.pb.o \ ../api/envoy/api/v2/core/grpc_service.pb.o \ ../api/envoy/api/v2/core/health_check.pb.o \ ../api/envoy/api/v2/core/protocol.pb.o \ ../api/envoy/api/v2/discovery.pb.o \ ../api/envoy/api/v2/eds.pb.o \ ../api/envoy/api/v2/endpoint/endpoint.pb.o \ ../api/envoy/api/v2/endpoint/load_report.pb.o \ ../api/envoy/api/v2/lds.pb.o \ ../api/envoy/api/v2/listener/listener.pb.o \ ../api/envoy/api/v2/ratelimit/ratelimit.pb.o \ ../api/envoy/api/v2/rds.pb.o \ ../api/envoy/api/v2/route/route.pb.o \ ../api/envoy/config/accesslog/v2/als.pb.o \ ../api/envoy/config/accesslog/v2/file.pb.o \ ../api/envoy/config/bootstrap/v2/bootstrap.pb.o \ ../api/envoy/config/filter/accesslog/v2/accesslog.pb.o \ ../api/envoy/config/filter/fault/v2/fault.pb.o \ ../api/envoy/config/filter/http/fault/v2/fault.pb.o \ ../api/envoy/config/filter/http/transcoder/v2/transcoder.pb.o \ ../api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.o \ ../api/envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.o \ ../api/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.o \ ../api/envoy/config/metrics/v2/metrics_service.pb.o \ ../api/envoy/config/metrics/v2/stats.pb.o \ ../api/envoy/config/overload/v2alpha/overload.pb.o \ ../api/envoy/config/rbac/v2alpha/rbac.pb.o \ ../api/envoy/config/trace/v2/trace.pb.o \ ../api/envoy/data/accesslog/v2/accesslog.pb.o \ ../api/envoy/data/cluster/v2alpha/outlier_detection_event.pb.o \ ../api/envoy/data/core/v2alpha/health_check_event.pb.o \ ../api/envoy/service/accesslog/v2/als.pb.o \ ../api/envoy/service/discovery/v2/ads.pb.o \ ../api/envoy/service/discovery/v2/hds.pb.o \ ../api/envoy/service/discovery/v2/sds.pb.o \ ../api/envoy/service/load_stats/v2/lrs.pb.o \ ../api/envoy/service/metrics/v2/metrics_service.pb.o \ ../api/envoy/service/ratelimit/v2/rls.pb.o \ ../api/envoy/type/matcher/metadata.pb.o \ ../api/envoy/type/matcher/number.pb.o \ ../api/envoy/type/matcher/string.pb.o \ ../api/envoy/type/matcher/value.pb.o \ ../api/envoy/type/percent.pb.o \ ../api/envoy/type/range.pb.o \ ../api/gogoproto/gogo.pb.o \ ../api/google/api/annotations.pb.o \ ../api/google/api/http.pb.o \ ../api/google/rpc/status.pb.o \ ../api/metrics.pb.o \ ../api/src/proto/grpc/health/v1/health.pb.o \ ../api/validate/validate.pb.o source_OBJS= $(common_SRCS:.cc=.o) \ $(exe_SRCS:.cc=.o) \ $(extensions_SRCS:.cc=.o) \ $(server_SRCS:.cc=.o) common_SRCS= $(wildcard common/access_log/*.cc) \ common/api/api_impl.cc \ common/api/os_sys_calls_impl.cc \ $(wildcard common/buffer/*.cc) \ $(wildcard common/chromium_url/*.cc) \ $(wildcard common/common/*.cc) \ common/common/posix/thread_impl.cc \ $(wildcard common/config/*.cc) \ $(wildcard common/event/*.cc) \ $(wildcard common/filesystem/*.cc) \ common/filesystem/kqueue/watcher_impl.cc \ $(wildcard common/filesystem/posix/*.cc) \ $(wildcard common/grpc/*.cc) \ common/html/utility.cc \ $(wildcard common/http/*.cc) \ $(wildcard common/http/http1/*.cc) \ $(wildcard common/http/http2/*.cc) \ $(wildcard common/init/*.cc) \ $(wildcard common/json/*.cc) \ $(wildcard common/memory/*.cc) \ $(wildcard common/network/*.cc) \ common/profiler/profiler.cc \ common/protobuf/utility.cc \ $(wildcard common/router/*.cc) \ $(wildcard common/runtime/*.cc) \ $(wildcard common/secret/*.cc) \ $(wildcard common/singleton/*.cc) \ $(wildcard common/ssl/*.cc) \ $(wildcard common/stats/*.cc) \ $(wildcard common/stream_info/*.cc) \ common/tcp/conn_pool.cc \ common/thread/thread_factory_singleton.cc \ common/thread_local/thread_local_impl.cc \ common/tracing/http_tracer_impl.cc \ $(wildcard common/upstream/*.cc) exe_SRCS= $(wildcard exe/*.cc) extensions_SRCS=\ extensions/filters/common/rbac/matchers.cc \ $(wildcard extensions/transport_sockets/tls/*.cc) \ $(wildcard extensions/access_loggers/*/*.cc) \ $(wildcard extensions/stat_sinks/metrics_service/*.cc) server_SRCS= $(wildcard server/config_validation/*.cc) \ server/configuration_impl.o \ server/connection_handler_impl.o \ server/drain_manager_impl.o \ server/guarddog_impl.cc \ server/http/admin.o \ server/http/config_tracker_impl.o \ server/lds_api.o \ server/listener_manager_impl.o \ server/options_impl.cc \ server/options_impl_platform_default.o \ server/overload_manager_impl.o \ server/proto_descriptors.cc \ server/server.o \ server/watchdog_impl.o \ server/worker_impl.o %.o: %.cc $(CCACHE) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $< LIBS= $(LOCALBASE)/lib/libabsl_bad_optional_access.a \ $(LOCALBASE)/lib/libabsl_base.a \ $(LOCALBASE)/lib/libabsl_city.a \ $(LOCALBASE)/lib/libabsl_graphcycles_internal.a \ $(LOCALBASE)/lib/libabsl_hash.a \ $(LOCALBASE)/lib/libabsl_hashtablez_sampler.a \ $(LOCALBASE)/lib/libabsl_int128.a \ $(LOCALBASE)/lib/libabsl_malloc_internal.a \ $(LOCALBASE)/lib/libabsl_raw_hash_set.a \ $(LOCALBASE)/lib/libabsl_spinlock_wait.a \ $(LOCALBASE)/lib/libabsl_stacktrace.a \ $(LOCALBASE)/lib/libabsl_strings.a \ $(LOCALBASE)/lib/libabsl_symbolize.a \ $(LOCALBASE)/lib/libabsl_synchronization.a \ $(LOCALBASE)/lib/libabsl_throw_delegate.a \ $(LOCALBASE)/lib/libabsl_time.a \ $(LOCALBASE)/lib/libabsl_time_zone.a \ -lcares -lcircllhist -lcrypto -levent -levent_pthreads -lgpr \ -lgrpc++ -lhttp_parser -lnghttp2 -lprotobuf -lpthread -lssl \ -lxxhash -lyaml-cpp envoy: $(api_OBJS) $(source_OBJS) $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) all: envoy .PHONY: all install Index: head/www/envoy/files/patch-source_common_common_logger.cc =================================================================== --- head/www/envoy/files/patch-source_common_common_logger.cc (nonexistent) +++ head/www/envoy/files/patch-source_common_common_logger.cc (revision 519012) @@ -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())); Property changes on: head/www/envoy/files/patch-source_common_common_logger.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property