From nobody Fri Jun 16 11:26:43 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 4QjH1J0NCPz4dv6g; Fri, 16 Jun 2023 11:26:44 +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 4QjH1H70lfz4Yhc; Fri, 16 Jun 2023 11:26:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686914804; 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=E9yzPUs2jszn7nuC91TY6BINPddVrgiCQxN5YD/LYRQ=; b=eVIDX1XfPExW2oENtVoKEgV3nLvJ91IRolgt/Yb1KqeTLXULpLlFp+tqzpw2dJUXm2s+Fd 1pHDzg2o1QZRP+huOu1scXFTYg6QZcH84331JPxl/SDmxzEuF4ps5b+zbb2iQf8fyQrJTo Uvil7nJIGpTDYYZCj30uSBRkmVgPeU4Aj3S0XnmqCAV0DI5hiujr1Unpp6aBbQW3C6IMxN Plm/nXDPCmVwYXulJMmgyzrEkDc/RSzVXrl3PChfIj+tAImFr/jkXqlA088v3b9Q0zg4sa 3QcQauRLBB+GCmVE/zUloWy0DyvLp39OR8VKH1vR62fGKT7J9b94jK4v/cPXiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686914804; 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=E9yzPUs2jszn7nuC91TY6BINPddVrgiCQxN5YD/LYRQ=; b=yjF/z2AgU0KIFhTJqLmhfmZRyoIWPXd993W4Poq9s37PgtXIZcZ80qoJXyDOrQt+JSgJCv udYVF1wRJzBptx+dKR+Ow8cSU10blqKZUwrO8+Cznx84Az2OOHZYL7QgAJpiUFbnHZSo/a L6riTbC3zOr//FerKdjqeRHv2k5YEey/X/Gn7M9O1NnnX7wbAm9HBKg/i8Ox8JU9hW3U4p WOdOXJIjLDlhYZYMSg0MI+wku94MsbpNKihwpCYtCWZn4APBTxMlLPDuby8BEqqDJyGWMU OCyL9WLi7wBh9igMzwwCpRuRtaejqhYCirQWxPCJ8F9Uz3Wau7h5/OKhYnNGuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686914804; a=rsa-sha256; cv=none; b=LTBZ+lji4Hw7w4qPry1SQfdDA+Th6+4CbqmImyR8ygQzLkVSBZU0paKkBkbptO9yjJPQWs 0x0AJ5LLryvC3/FtH4zZyswHPtoNXGACVG/lRiu863GmEMzhiSxDqoNGxrPa7TBbJ5NuH1 xy1iFO7fPamulGtt5rDg93MY2EZWw4NAqO9Bl5JCbYS89fiUbtDDOwFWgo3hXCxS1XQpT9 E8KW2ZIf8VLT24S0W+QI716GrvqU4hOo8DMdeQJvC27UbeDYNFH0MREF3k2RYVBKE4RoRA dvAJPylmnNTa/egLkLpAEDLGPn+44SgG6tbcMoBodSexWQBIKO8a1PeSkNG8tg== 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 4QjH1H64TwzR5v; Fri, 16 Jun 2023 11:26:43 +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 35GBQh66046243; Fri, 16 Jun 2023 11:26:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35GBQhCX046242; Fri, 16 Jun 2023 11:26:43 GMT (envelope-from git) Date: Fri, 16 Jun 2023 11:26:43 GMT Message-Id: <202306161126.35GBQhCX046242@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: 51b815d204e7 - main - www/envoy: unbreak the port's build on i386 (at least) 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: 51b815d204e78b3af2cbdbbba67e06e4017d8515 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=51b815d204e78b3af2cbdbbba67e06e4017d8515 commit 51b815d204e78b3af2cbdbbba67e06e4017d8515 Author: Alexey Dokuchaev AuthorDate: 2023-06-16 11:26:06 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-06-16 11:26:06 +0000 www/envoy: unbreak the port's build on i386 (at least) Abseil developers say they don't know of anything faster than CityHash32 for 32-bit x86 code, thus we must link this symbol to unbreak the build: ld: error: undefined symbol: absl::lts_20220623:: hash_internal::CityHash32(char const*, unsigned int) >>> referenced by access_log_impl.cc --- www/envoy/Makefile | 1 - www/envoy/files/makefile-main | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/www/envoy/Makefile b/www/envoy/Makefile index 6765c0d10dd7..d19216c4f84d 100644 --- a/www/envoy/Makefile +++ b/www/envoy/Makefile @@ -11,7 +11,6 @@ WWW= https://www.envoyproxy.io/ LICENSE= APACHE20 -BROKEN_i386= makes a lot of 64-bit assumptions (patches welcome) BROKEN_SSL= base openssl libressl libressl-devel BROKEN_SSL_REASON= requires BoringSSL diff --git a/www/envoy/files/makefile-main b/www/envoy/files/makefile-main index 1821e2ec7602..55fbea6677e5 100644 --- a/www/envoy/files/makefile-main +++ b/www/envoy/files/makefile-main @@ -724,8 +724,11 @@ server/admin/html/admin_html_gen.h: %.o: %.cc $(CCACHE) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $(<:.cc=.o) -c $< +maybe_city = $(if $(shell nm -C common/access_log/access_log_impl.o \ + | grep ::hash_internal::CityHash),city) + ABSEIL_LIBS=\ - base cord cordz_functions cordz_info flags_commandlineflag \ + base $(maybe_city) cord cordz_functions cordz_info flags_commandlineflag \ flags_internal flags_marshalling flags_parse flags_reflection \ hash raw_hash_set spinlock_wait stacktrace status statusor \ str_format_internal strings symbolize synchronization \