From nobody Thu Sep 15 21:13:35 2022 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 4MT90v5fHDz4cKTZ; Thu, 15 Sep 2022 21:13:35 +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 4MT90v51L3z3p1H; Thu, 15 Sep 2022 21:13:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663276415; 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=gJfAI/7Ylzrp5lYMub9LRdUScq5DarkvNA9d93kI01I=; b=SHbKG0rHdHhCyWveSaiTnjaBBczKEudFKWlIhta7DjFCFMo+3xUe9vAMRqeIwdnBHqNCtl 082Gzn4yrqateaa25rztZETxUI21a548grn4M+njt68s4NbapQZK4bWcxuw0LBHjtYnkN/ OR2eWuiyX5IjEFRl5c2TMYuTOONtF2ecr9/4Zki4OkCiDOrLtzyr0Iz88pa07O1dzdFJKK 2o6WAJA/XLtvEaEZd15rsTF/gpvTWRAUvKcMyGrJwB6uH2sLLyRKydcY4QO2SRFt1dwxdN pOcLtJgHROW1ifhWnaWAxlyTcf8QzOfjR87clKFHBS0SSa0n+/PZ+mBg5hYBLw== 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 4MT90v43gTz188d; Thu, 15 Sep 2022 21:13:35 +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 28FLDZEk096413; Thu, 15 Sep 2022 21:13:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28FLDZUh096412; Thu, 15 Sep 2022 21:13:35 GMT (envelope-from git) Date: Thu, 15 Sep 2022 21:13:35 GMT Message-Id: <202209152113.28FLDZUh096412@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: ac39d3225682 - main - www/firefox: fix build on i386 (again) 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: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac39d32256828d37b4dd99a2458298aa90010db2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663276415; 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=gJfAI/7Ylzrp5lYMub9LRdUScq5DarkvNA9d93kI01I=; b=VkBMn8PxzzntZvBqahfKL5wGm9RyLGqv+D15QhqTFWgJvuOmUY/6Zi6FCl2fUlTGPIlICF FZjnj5LmWgdiLh7VPy05iYj78cKnS4kF13VaJjiw6yU+2mBDBHu3I/GOKErv2qmsQ2DF6S UP+mq5eci6gn+5rQJG3UV02wGwcfpWQyBFUqTLgcI69JDvbrJb0dC+nBndwaYAIWDKIO5D 9pxcNtiwMI/IrpGcwDxxsurotEMYhnS03rnGtcyPLeLxbsn3+Qjt+qCw690QBLx4g4tvZQ X3Kf5+LSBksF4UBbxl4K5NykiQIIyWbUqndnAEYFEMqMQcHHbvsApk4Mx9loCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663276415; a=rsa-sha256; cv=none; b=Y3SBcJjx9ByU0LFiw90IIMUn6OcPHygW1NVXhw/atM9GTHytniLt5hr/SSjVJquQmZ1c+z Y2CSQq+yR8mB+POaRw2AK9ovZtSDdwqqIi6sSQt//1jzcRftWwnVRlodB4F8N+yShv6AQ+ zKjaglciqmzTi9NRBnmf6RG70j16xxXyDOSUS9sus0O97V0qALuzzAvEUc2bIpfmtZL7ra oiuxOQ05ETeu1lLmllvyjUm8GrTCJ8ZeY2ITvfwF+WU/dSpMkXSct/fbBpjpifOh937n+t z3inxzxGmNomCc2KRXD4BZ9Vpx6i0S8CG+/i5LpmBrQsqfIEZtIcItZ+cKygdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=ac39d32256828d37b4dd99a2458298aa90010db2 commit ac39d32256828d37b4dd99a2458298aa90010db2 Author: Christoph Moench-Tegeder AuthorDate: 2022-09-15 21:12:36 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2022-09-15 21:12:36 +0000 www/firefox: fix build on i386 (again) upstream fix for alignment issues in embedded protobuf was not complete Reported by: fallout --- 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_;