From nobody Mon Jun 12 16:37:24 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qfy5c39S4z4d63R; Mon, 12 Jun 2023 16:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qfy5c2Wwvz3CF2; Mon, 12 Jun 2023 16:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686587844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tExjc48b+NSN8Z6uuawfEte/wjzbnhQKfgNPYtePdsU=; b=KKx/x0W9vmZxVdlTTf35YCgxpxqDbGp/cqUCGTVFZNUkEjvWW6n0zzbugnajrHoa67eDNn xRAwi4uB+09SgCOkZGH1QdQeTAxypAjkGhQKDloRetxlsjy8S9A3JiSKbWsKcQMLQ4QLrG IYEJ72a2PMfJEsL7kO8W5WKtsVapIsLLD2c5nfYhIq02iQXsoBQB7omzAbCDo3Vx9b4H0j 5a/jq8NvnXEria8mnB1GT/wcs9jS0tc/7ic6O20Nvj4k/rgLrLBOdCFaQp/GVhPoDO7awY 8Ha3uotScQ0DPpZMlTem/twslecQlkzeNQ9Vke1+08a0ANeq3laClcLkR9I0KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686587844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tExjc48b+NSN8Z6uuawfEte/wjzbnhQKfgNPYtePdsU=; b=uFx91YcNYeXcqt4GmAsTLWagyc6T+KSWqyaMbuSfWTtYiVZuBtBN4q/4H1MzL3fWqAdXOm z93JG1c7f/mmbnodKRsWNqNHnZwA1l9PM96gJFzZ6tLE3IvfXH4WSsXB8h3FM7AaLT4J0u aunc6mClhE5Zwll3ACZrx+q9SIVpSk2pdr+VbG5T0DhAAIfHcz4o3AvApRdw7Zt2JVYje6 T3JZtEXFnFXtkArcwDmFXFAFRaKmkMIQBP0LPO4ZPMPu/9yI6IbhpMsNQJuwYKtQcFXMxJ pbYh1Bqndn+LT5WRvuPX3aXSHLqV1TNwW7gyMBaTI9MpZ+AZdMqolV0Mbby9Cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686587844; a=rsa-sha256; cv=none; b=MuomIcd/UItwiEB7eReJ3Kvk8pxCL0fEwXTXn6m8cXh4ZuTpzH881j972CicBHoiYXS2cU 9PzMU9UZ0B5xy0ibhVkxgiXBbhGfZlPTFcljcPoFHwqhOGMkrSgsa7T2sdlfmEsjIXTF/+ nNbY0mXQBycluoCluIaIOasMgfDh+UHWAy0fnRKx2CkfH9bbfJ3prtCQLslngDeSq+eU16 CDnfdBiKU/kdNS6Z+HrbfjHGFRVVt4NfnCZ7xt8F9XUzgtCvX5ZTtWoE+18g++kt5YJzlI GktBu9j7BK96er3EFS4A+qRDdKeeUXB939mVeeUcjv85ZFpXbMqtM29rHcihfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qfy5c1Tj4znD1; Mon, 12 Jun 2023 16:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35CGbOGn061313; Mon, 12 Jun 2023 16:37:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35CGbO2i061312; Mon, 12 Jun 2023 16:37:24 GMT (envelope-from git) Date: Mon, 12 Jun 2023 16:37:24 GMT Message-Id: <202306121637.35CGbO2i061312@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 81176cb84590 - main - www/envoy: hook compression extensions to the port's build. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81176cb84590e06c32b7d2694a9cf0e251ebaed3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=81176cb84590e06c32b7d2694a9cf0e251ebaed3 commit 81176cb84590e06c32b7d2694a9cf0e251ebaed3 Author: Alexey Dokuchaev AuthorDate: 2023-06-12 16:35:38 +0000 Commit: Alexey Dokuchaev 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= ../..