Date: Mon, 12 Jun 2023 16:37:24 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 81176cb84590 - main - www/envoy: hook compression extensions to the port's build. Message-ID: <202306121637.35CGbO2i061312@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=81176cb84590e06c32b7d2694a9cf0e251ebaed3 commit 81176cb84590e06c32b7d2694a9cf0e251ebaed3 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2023-06-12 16:35:38 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2023-06-12 16:35:38 +0000 www/envoy: hook compression extensions to the port's build. --- www/envoy/Makefile | 4 +++- www/envoy/files/makefile-genproto | 8 +++++++- www/envoy/files/makefile-main | 13 +++++++++++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/www/envoy/Makefile b/www/envoy/Makefile index 3c290d63dceb..93b79025739e 100644 --- a/www/envoy/Makefile +++ b/www/envoy/Makefile @@ -22,6 +22,7 @@ BUILD_DEPENDS= ${NONEXISTENT}:devel/grpc:patch \ ${LOCALBASE}/include/spdlog/spdlog.h:devel/spdlog \ ${LOCALBASE}/include/tclap/CmdLine.h:devel/tclap12 LIB_DEPENDS= libabsl_base.so:devel/abseil \ + libbrotlidec.so:archivers/brotli \ libcares.so:dns/c-ares \ libcircllhist.so:devel/libcircllhist \ libevent.so:devel/libevent-devel \ @@ -32,7 +33,8 @@ LIB_DEPENDS= libabsl_base.so:devel/abseil \ libprotobuf.so:devel/protobuf \ libre2.so:devel/re2 \ libxxhash.so:devel/xxhash \ - libyaml-cpp.so:devel/yaml-cpp + libyaml-cpp.so:devel/yaml-cpp \ + libzstd.so:archivers/zstd USES= compiler:c++17-lang cpe gmake python:build shebangfix ssl CPE_VENDOR= ${PORTNAME}proxy diff --git a/www/envoy/files/makefile-genproto b/www/envoy/files/makefile-genproto index aa3dad630e7b..98ad2575a6dd 100644 --- a/www/envoy/files/makefile-genproto +++ b/www/envoy/files/makefile-genproto @@ -164,6 +164,12 @@ API_V3_PB_HEADERS=\ envoy/extensions/access_loggers/wasm/v3/wasm.pb.h \ envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.pb.h \ envoy/extensions/common/ratelimit/v3/ratelimit.pb.h \ + envoy/extensions/compression/brotli/compressor/v3/brotli.pb.h \ + envoy/extensions/compression/brotli/decompressor/v3/brotli.pb.h \ + envoy/extensions/compression/gzip/compressor/v3/gzip.pb.h \ + envoy/extensions/compression/gzip/decompressor/v3/gzip.pb.h \ + envoy/extensions/compression/zstd/compressor/v3/zstd.pb.h \ + envoy/extensions/compression/zstd/decompressor/v3/zstd.pb.h \ envoy/extensions/early_data/v3/default_early_data_policy.pb.h \ envoy/extensions/filters/common/dependency/v3/dependency.pb.h \ envoy/extensions/filters/http/router/v3/router.pb.h \ @@ -279,4 +285,4 @@ MISC_PB_HEADERS=\ all: $(API_V2_PB_HEADERS) $(API_V3_PB_HEADERS) $(MISC_PB_HEADERS) -.phony: all +.PHONY: all diff --git a/www/envoy/files/makefile-main b/www/envoy/files/makefile-main index f44f6982c1a2..e4e92420c3b0 100644 --- a/www/envoy/files/makefile-main +++ b/www/envoy/files/makefile-main @@ -1,5 +1,6 @@ LOCALBASE?= /usr/local -CXXFLAGS+= -std=c++17 -Wall -Wextra -Wno-unused-parameter +CXXFLAGS+= -std=c++17 -Wall -Wextra -Wno-deprecated-declarations \ + -Wno-unused-parameter CPPFLAGS+= -DBUILD_SCM_REVISION=\"c7e8e73\" \ -DBUILD_SCM_STATUS=\"Modified\" \ -DNDEBUG -DENVOY_SSL_VERSION=\"BoringSSL\" \ @@ -140,6 +141,12 @@ api_OBJS= envoy/admin/v2alpha/certs.pb.o \ envoy/extensions/access_loggers/open_telemetry/v3/logs_service.pb.o \ envoy/extensions/access_loggers/stream/v3/stream.pb.o \ envoy/extensions/common/ratelimit/v3/ratelimit.pb.o \ + envoy/extensions/compression/brotli/compressor/v3/brotli.pb.o \ + envoy/extensions/compression/brotli/decompressor/v3/brotli.pb.o \ + envoy/extensions/compression/gzip/compressor/v3/gzip.pb.o \ + envoy/extensions/compression/gzip/decompressor/v3/gzip.pb.o \ + envoy/extensions/compression/zstd/compressor/v3/zstd.pb.o \ + envoy/extensions/compression/zstd/decompressor/v3/zstd.pb.o \ envoy/extensions/early_data/v3/default_early_data_policy.pb.o \ envoy/extensions/filters/common/dependency/v3/dependency.pb.o \ envoy/extensions/filters/http/upstream_codec/v3/upstream_codec.pb.o \ @@ -316,6 +323,7 @@ exe_SRCS= $(wildcard exe/*.cc) \ extensions_SRCS=\ $(wildcard extensions/access_loggers/[^w]*/*.cc) \ + $(wildcard extensions/compression/*/*/*.cc) \ extensions/early_data/default_early_data_policy.cc \ $(wildcard extensions/filters/common/expr/*.cc) \ extensions/filters/common/rbac/matchers.cc \ @@ -549,9 +557,10 @@ ABSEIL_LIBS=\ throw_delegate time time_zone LIBS= $(addprefix -labsl_,$(ABSEIL_LIBS)) \ + -lbrotlidec -lbrotlienc \ -lcares -lcircllhist -lcrypto -levent -levent_pthreads -lfmt \ -lgpr -lgrpc -lgrpc++ -licuuc -lnghttp2 -lprotobuf -lpthread \ - -lre2 -lssl -lupb -lxxhash -lyaml-cpp -lz + -lre2 -lssl -lupb -lxxhash -lyaml-cpp -lz -lzstd VPATH= ../..
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306121637.35CGbO2i061312>