From nobody Sat Aug 20 21:24:06 2022 X-Original-To: dev-commits-ports-branches@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 4M9BT26xvLz4ZKyV; Sat, 20 Aug 2022 21:24:06 +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 4M9BT26SBvz3xmR; Sat, 20 Aug 2022 21:24:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661030646; 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=OALGzzUCozzxJn/0UKZr6V2ySJROyzBLGDzpTtjh188=; b=NIoXL55UnP0GGlid5d15Sz7CUCgf4sQxZP1iXAXxIoFn9JVUqtbXe9kD/2qIweNSoEu2Gv zRagOETiNbU+tKQEdUdoEhIVvpXfHIguBQvtqN2MpynEidwmfIPudlVBdZtKVJ8kyFXBC0 0g13aVl+4XdYuLcfiPFTR54zfGPwnq/ow1HkTLFabeje+BA6Mg2CaNY0lBVYNo8bk6vJRm VB7RfDion6CUpBJA29CNaEQCDc5+fbBxw+6FyfjBlDZR9Zt4i+R3+DBzetk7phYDo0LQd7 MR15ARGqiBay77WnGue8Ye33pO+Q4C+UZwInWKWX+0NlFIVdW+XlVhDjfoVPMA== 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 4M9BT25VV9zmdR; Sat, 20 Aug 2022 21:24:06 +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 27KLO6pv018623; Sat, 20 Aug 2022 21:24:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27KLO6If018622; Sat, 20 Aug 2022 21:24:06 GMT (envelope-from git) Date: Sat, 20 Aug 2022 21:24:06 GMT Message-Id: <202208202124.27KLO6If018622@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 1ac3ac5740b4 - 2022Q3 - www/firefox: fix build on i386 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 1ac3ac5740b49896301d1272993c766cd896a3f6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661030646; 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=OALGzzUCozzxJn/0UKZr6V2ySJROyzBLGDzpTtjh188=; b=GCOdNn3edCMXx2uGsKyTzbghzNyH4C7ePIgH4MMdutFfsLgzk5Vd6HvcygvEWGe8WkwXBf JrtgM041NvnbH/1I1049HSB4WYr9TW1X3boKT8qECaRf6poYYDRKq68onzelQgo1Zd3oHF d1CuLu36lztK0N1U551S1kLlbMQHqmha1QsHuGYO6Ih0/MuT6H3jnTRe7GcYGHARGzxgxZ cTMqjbFwu7hTUoNZI7Px5Yc6RPIEP4873Lua/IsJ+HU+oJ1VGDy77iX3tIKxYPY+/RnD3/ 4ZOuBFJt1VJqP4OchfFtIeJZzWhMiWoQ6H3fbA8rCLNMEr206NREZ267EDdl+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661030646; a=rsa-sha256; cv=none; b=k3+O9U93hquK0e2cU6Y5sT7AovWA1ZvJC2On3VyxDIBGYhEoHkArbq6AnAA8IJEpFhorQo kdBfwdKZO3itN83Ok6ayvgXWA1UACYmaiqceH1UGMKXhLR2cE73QUO1ZI+ON9cVvRB3eq2 H5h5W7AR4K1W9lZ1xP9qUj2SUAnfsEa85z74EPtkJsCcwQQSjLJ5TrY014T4XjWEKM8t4y DkREr2pnGUm83uOsDK/V+OC1H6Igfi2wdZWCxDJAW57wGE932N5x7uue3VKjSOYaRsvV2Z 7zgtDZ7pbji80W/tVYeKysFZDLDzlbg/wBxdAsxZ9f2uywaZSr6sdOWBCkM0CA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ac3ac5740b49896301d1272993c766cd896a3f6 commit 1ac3ac5740b49896301d1272993c766cd896a3f6 Author: Christoph Moench-Tegeder AuthorDate: 2022-08-20 21:20:00 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2022-08-20 21:23:55 +0000 www/firefox: fix build on i386 The included protobuf tries to figure out optimal memory alignment for some variables, but on i386 our library is not really helpful with that. Adjust the alignment for the problematic case, and disable one static_assert() checking for alignment values (borrowed from devel/protobuf port). (cherry picked from commit 0e5839c5f4464fbce310362b973101753f73e4be) --- www/firefox/files/patch-i386-protobuf-alignment | 29 +++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/www/firefox/files/patch-i386-protobuf-alignment b/www/firefox/files/patch-i386-protobuf-alignment new file mode 100644 index 000000000000..de5cdb723ce2 --- /dev/null +++ b/www/firefox/files/patch-i386-protobuf-alignment @@ -0,0 +1,29 @@ +# On FreeBSD/i386's LLVM, actual alignment for atomic types requires +# stricter alignment rules, mostly on 8 byte boundaries instead of 4 byte +# as indicated by max_align_t. +# Patch for arenastring.cc borrowed from devel/protobuf/files/patch-i386 + +--- toolkit/components/protobuf/src/google/protobuf/arenastring.cc.orig 2022-08-20 22:07:01.600662000 +0200 ++++ toolkit/components/protobuf/src/google/protobuf/arenastring.cc 2022-08-20 22:07:55.969192000 +0200 +@@ -64,7 +64,8 @@ + #endif + constexpr size_t kStringAlign = alignof(std::string); + +-static_assert((kStringAlign > kNewAlign ? kStringAlign : kNewAlign) >= 8, ""); ++// this does not hold with llvm on FreeBSD/i386 ++// static_assert((kStringAlign > kNewAlign ? kStringAlign : kNewAlign) >= 8, ""); + static_assert(alignof(ExplicitlyConstructedArenaString) >= 8, ""); + + } // namespace + +--- ./toolkit/components/protobuf/src/google/protobuf/arena_impl.h.orig 2022-08-20 20:07:57.096818000 +0200 ++++ ./toolkit/components/protobuf/src/google/protobuf/arena_impl.h 2022-08-20 21:40:47.821690000 +0200 +@@ -640,7 +640,7 @@ + #ifdef _MSC_VER + #pragma warning(disable : 4324) + #endif +- struct alignas(kCacheAlignment) CacheAlignedLifecycleIdGenerator { ++ struct alignas(alignof(std::atomic)) CacheAlignedLifecycleIdGenerator { + std::atomic id; + }; + static CacheAlignedLifecycleIdGenerator lifecycle_id_generator_;