From nobody Fri Jun 09 09:54:46 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 4QcxJR1lWMz4bL5c; Fri, 9 Jun 2023 09:54:47 +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 4QcxJR18B9z43Tg; Fri, 9 Jun 2023 09:54:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686304487; 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=i5h6KSpY9v5InBQ77/dHMW+pmbDfj6YMTnC9xgivA2M=; b=Dw6umvgu/3vsr2VZyZYC9nrMKqQE66dX+4o/DnSoXwz0Rrou5HQ1q9iEjKZthkHgtzedDh 2SeLLs39nChw8VaQ5onU6YlVT3sry8rp62XdWIDHndpG113PwmClvo7RYUJLDcQsVewQvg Q7wOJeftHlDxheA39fUXUfhd6bKucOXzVGJNaaPeoTmVt2hGdIIABPIO1CrINfBlEqrASn WuWexLPTd+MzT7q4UXx2xjjTe7hcBvndkaKYo3AG/jAS03xElAR6U6VwUt83e4NNCT0+VZ raC1PoLvFQ3oHO+ijze08mRdkf6aLuDo8Nw16oBgFcnvj2gJDZw1YEm3Fkp29A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686304487; 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=i5h6KSpY9v5InBQ77/dHMW+pmbDfj6YMTnC9xgivA2M=; b=tT52gaWgFxlt7XxJqL6M4oIj64Z2+dftBcbDIG5uui85h8kthjbHDLI87q6CuZkn0EC4uS k9TgpAZ1i/Oakh/dkQ3Z/0mA9a/iNJYHtPDeM49Fh7KBtUBbM0q49xPDqLEYzGJ85uQEQO To3y/uWMErbbC+qHQuXRzkP0Y9tjV8LdXuM3S/DSLWQSRVHZ2QdtWY3Rtqf0OKeXCXhHTW S2kwnWnBWE2ecVICrC9qDZyPj+S/sJ2pN5BUhB7EN8v0LiQR7N7ArGjWF81ayDCtKwYxbA FrwAmOKkqG3JeICfAv9267GZHzx+92lTcdQ17Nk/7smhstihEm7ZtfA2TpuriQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686304487; a=rsa-sha256; cv=none; b=br7RH1EaIXlH6oIt8ZlMcmAaS1VTvXNeWoFof55rKUm2MGEJKd7QLrIhMMhWFnXIOxAYzR /Dybnu+VXuyfcGQ7waxZSFcH2f4zis/CzYYbYvqZC9k6rHvBFvh8QQ6S7CYvb/lpzZWOR+ bYJCqezgvD/XXvmCe+gLgSBpWpfiPUfRIlj1JUvmHNJbzPeBTzE63ntbnfIgpbSpytie3A bU67xT1ehZtHTLLLBZA+4wUwWZq/hiGxYOM9kEuXnQ+i2HNnpPY1JLa9YbKUi7+o2SPnI9 DWOuR4rI0QFj5296QGf8TK9eZGuOtSyGgZBLz5FtB3bdAquADNRjBeLgYXcaiw== 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 4QcxJR051JzWfP; Fri, 9 Jun 2023 09:54:47 +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 3599sk6u080734; Fri, 9 Jun 2023 09:54:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3599sk3L080733; Fri, 9 Jun 2023 09:54:46 GMT (envelope-from git) Date: Fri, 9 Jun 2023 09:54:46 GMT Message-Id: <202306090954.3599sk3L080733@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: 49a12462dd2c - main - www/envoy: reduce the gratuitous differences with coming update 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: 49a12462dd2c0bc3bd6d631e9e0bdcb15f88c20b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=49a12462dd2c0bc3bd6d631e9e0bdcb15f88c20b commit 49a12462dd2c0bc3bd6d631e9e0bdcb15f88c20b Author: Alexey Dokuchaev AuthorDate: 2023-06-09 09:53:22 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-06-09 09:53:22 +0000 www/envoy: reduce the gratuitous differences with coming update - Remove the common `../api/' prefix from every API *.pb.o file and append it when using the variable as target's prerequisite - Do the final linking via ccache(1) if configured and do not limit the number of errors (let's see them all) - Try to run the newly built executable to see whether it works --- www/envoy/files/makefile-main | 133 +++++++++++++++++++++--------------------- 1 file changed, 67 insertions(+), 66 deletions(-) diff --git a/www/envoy/files/makefile-main b/www/envoy/files/makefile-main index 19d246a8cd23..702d339dcdc8 100644 --- a/www/envoy/files/makefile-main +++ b/www/envoy/files/makefile-main @@ -7,70 +7,70 @@ CPPFLAGS+= -I. -I../include -I../api -I$(LOCALBASE)/include \ 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 +api_OBJS= envoy/admin/v2alpha/certs.pb.o \ + envoy/admin/v2alpha/clusters.pb.o \ + envoy/admin/v2alpha/config_dump.pb.o \ + envoy/admin/v2alpha/memory.pb.o \ + envoy/admin/v2alpha/metrics.pb.o \ + envoy/admin/v2alpha/mutex_stats.pb.o \ + envoy/admin/v2alpha/server_info.pb.o \ + envoy/api/v2/auth/cert.pb.o \ + envoy/api/v2/cds.pb.o \ + envoy/api/v2/cluster/circuit_breaker.pb.o \ + envoy/api/v2/cluster/outlier_detection.pb.o \ + envoy/api/v2/core/address.pb.o \ + envoy/api/v2/core/base.pb.o \ + envoy/api/v2/core/config_source.pb.o \ + envoy/api/v2/core/grpc_service.pb.o \ + envoy/api/v2/core/health_check.pb.o \ + envoy/api/v2/core/protocol.pb.o \ + envoy/api/v2/discovery.pb.o \ + envoy/api/v2/eds.pb.o \ + envoy/api/v2/endpoint/endpoint.pb.o \ + envoy/api/v2/endpoint/load_report.pb.o \ + envoy/api/v2/lds.pb.o \ + envoy/api/v2/listener/listener.pb.o \ + envoy/api/v2/ratelimit/ratelimit.pb.o \ + envoy/api/v2/rds.pb.o \ + envoy/api/v2/route/route.pb.o \ + envoy/config/accesslog/v2/als.pb.o \ + envoy/config/accesslog/v2/file.pb.o \ + envoy/config/bootstrap/v2/bootstrap.pb.o \ + envoy/config/filter/accesslog/v2/accesslog.pb.o \ + envoy/config/filter/fault/v2/fault.pb.o \ + envoy/config/filter/http/fault/v2/fault.pb.o \ + envoy/config/filter/http/transcoder/v2/transcoder.pb.o \ + envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.o \ + envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.o \ + envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.o \ + envoy/config/metrics/v2/metrics_service.pb.o \ + envoy/config/metrics/v2/stats.pb.o \ + envoy/config/overload/v2alpha/overload.pb.o \ + envoy/config/rbac/v2alpha/rbac.pb.o \ + envoy/config/trace/v2/trace.pb.o \ + envoy/data/accesslog/v2/accesslog.pb.o \ + envoy/data/cluster/v2alpha/outlier_detection_event.pb.o \ + envoy/data/core/v2alpha/health_check_event.pb.o \ + envoy/service/accesslog/v2/als.pb.o \ + envoy/service/discovery/v2/ads.pb.o \ + envoy/service/discovery/v2/hds.pb.o \ + envoy/service/discovery/v2/sds.pb.o \ + envoy/service/load_stats/v2/lrs.pb.o \ + envoy/service/metrics/v2/metrics_service.pb.o \ + envoy/service/ratelimit/v2/rls.pb.o \ + envoy/type/matcher/metadata.pb.o \ + envoy/type/matcher/number.pb.o \ + envoy/type/matcher/string.pb.o \ + envoy/type/matcher/value.pb.o \ + envoy/type/percent.pb.o \ + envoy/type/range.pb.o \ + gogoproto/gogo.pb.o \ + google/api/annotations.pb.o \ + google/api/http.pb.o \ + google/rpc/status.pb.o \ + metrics.pb.o \ + src/proto/grpc/health/v1/health.pb.o \ + validate/validate.pb.o source_OBJS= $(common_SRCS:.cc=.o) \ $(exe_SRCS:.cc=.o) \ @@ -162,8 +162,9 @@ LIBS= $(LOCALBASE)/lib/libabsl_bad_optional_access.a \ -lgrpc++ -lhttp_parser -lnghttp2 -lprotobuf -lpthread -lssl \ -lxxhash -lyaml-cpp -envoy: $(api_OBJS) $(source_OBJS) - $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) +envoy: $(addprefix ../api/,$(api_OBJS)) $(source_OBJS) + $(CCACHE) $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) -Wl,-error-limit=0 + ./$@ --version all: envoy