From nobody Thu Sep 15 21:15:52 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 4MT93Y0JbPz4cKyG; Thu, 15 Sep 2022 21:15:53 +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 4MT93X6rVHz3pl0; Thu, 15 Sep 2022 21:15:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663276553; 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=cgKTJMupZcMojsWjBjBMhfm4y/z9c1EglnJn5Lw5Lxs=; b=TpI0wxf2um5jbulJC83IQJOyyNJKma9Vm3rtdS9vF1wE6a886I3mkdCH58/vP+5NAI/KRO 599zsYwROd+NE7bCn9vX7t5nmkXNa7h3TaMEoAOQrutBYxTen1gyLSEJkRWw3N+edHWpTR 6+xW53sBvVg2y1WEbVPTRXt/1B9jIzennJmNvYONvRHxA0TTrygvJeSmrOaeAOpMBP6c3W 0qTIGTkT5uefpbHfMo6CVudYN7fIAoKShX3fGt5j60UUuTjZ/Z9+T5kV3Inknw64/ubYew NLnQzW9M4oMX8rMc23Lq1eV7xqH//LfA+r4qoeiyMeu10Hy4fthtvDhh7/Y1dA== 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 4MT93X5tWXz17tk; Thu, 15 Sep 2022 21:15:52 +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 28FLFqVr097069; Thu, 15 Sep 2022 21:15:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28FLFqSv097068; Thu, 15 Sep 2022 21:15:52 GMT (envelope-from git) Date: Thu, 15 Sep 2022 21:15:52 GMT Message-Id: <202209152115.28FLFqSv097068@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: 1eca35157e9d - 2022Q3 - www/firefox: fix build on i386 (again) 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: 1eca35157e9dda8f83d0d672d4ecfc6a5cfdf3d6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663276553; 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=cgKTJMupZcMojsWjBjBMhfm4y/z9c1EglnJn5Lw5Lxs=; b=H3wSkcfFjSEON0IXOoZ5WegNbfKZGC6EkDsGKHSbwTFUDawtYQvG0sUp9iVG0LYJprKOX0 jyR5epf6Y3MC3xMBR4WQd5Zau3Xv//rr3ca3H2t7kDcGDY1fLtC7rqEKFbf0x7SbDYSEQW /8i/JSQ17wvEvN4afNGDDmz3I0z6aKoFDJmcW8O0fy3X/oKmbXPhELl/QndrwA2O3xURln Pxon5K91AGeENNwVgKaN9DzGRPFoPPG0oPlE1+ha90qzNFsGxVsqbfSFbO/ldn3/+JI6NF VUlT872cr5SW9nUsri1poROjNnWDGjT/i3rkdh43N+43I22WUE5VFEPCEMTN7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663276553; a=rsa-sha256; cv=none; b=SiJkT93ezIgNJZFi7qsAwcXt33sErVluVMuxYEQN7ZYoTKvHppqhRPWRS3xzVX4w5fDCJI /fM6S1Vy2qxEUCt4zcrsQ8wTJXCnF38pdxyjzLB5s8cpdCOrGu33L9i0mKrts79cEUV5N3 0B+FN9y3VpCsbsHHSKKtxp3CjgwGQO8azDk3xwaPVDWR6/42sM9BBnZgMinbgFkPg5eQqp mK7NTr/a8iGrHkc1BBI1+8Nm7ULJQ+tiO6sVCD1fn2Os/1J+Qox29eN07ACtFch2mqzShw F1xf3vVBSVwxTZfCoYsseRbxDkbmzPtsc8Z/Av5oqJQ0CYNTa3bTMXJFNCxjYA== 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=1eca35157e9dda8f83d0d672d4ecfc6a5cfdf3d6 commit 1eca35157e9dda8f83d0d672d4ecfc6a5cfdf3d6 Author: Christoph Moench-Tegeder AuthorDate: 2022-09-15 21:12:36 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2022-09-15 21:15:45 +0000 www/firefox: fix build on i386 (again) upstream fix for alignment issues in embedded protobuf was not complete Reported by: fallout (cherry picked from commit ac39d32256828d37b4dd99a2458298aa90010db2) --- www/firefox/files/patch-i386-protobuf-alignment | 15 +++++++++++++++ 1 file changed, 15 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..0d58c8644e79 --- /dev/null +++ b/www/firefox/files/patch-i386-protobuf-alignment @@ -0,0 +1,15 @@ +# 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. + +--- ./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_;