From nobody Sat Aug 20 21:23:18 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 4M9BS70jNtz4ZL1d; Sat, 20 Aug 2022 21:23:19 +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 4M9BS70Dcbz3xcn; Sat, 20 Aug 2022 21:23:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661030599; 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=BlLDQsFDhvzZmNCXJddGqEklYDURlPvKoMi/0gHXCbU=; b=ha4mML6/3wZtL658/JeY+LRcvAqJtfq8NSzoL6Uun5CFddiY6qxJvYA0HmkB8gzrke8SVS oxKwe86wYkajNlkrg9+uQY787a/6VDPmP8ND0Lu6mnx1eCpTUGRtqDSizltUc7d3xdOSMA XW/yhl+Mc01Zjn5zZTJvxGSyY6WTaWR0pQRd5o/fVRiPivQ0pz7BesOAO+Bz9Qste9TUJ/ x0yMYCyRKqjNNu1YGFDkt+r8+zg5Z2ID9TmuJuy/TlaFKxpLzrCHen+7dvcjaIp0s0t8Y0 YdZTG1oZkSI1qkbdN2ypOlSPeUseAMsnnCi21NcqxmyRwsK/1/YjkZLJLy8MVQ== 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 4M9BS66Nw0zlhJ; Sat, 20 Aug 2022 21:23:18 +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 27KLNIZv018393; Sat, 20 Aug 2022 21:23:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27KLNIoE018392; Sat, 20 Aug 2022 21:23:18 GMT (envelope-from git) Date: Sat, 20 Aug 2022 21:23:18 GMT Message-Id: <202208202123.27KLNIoE018392@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: 0e5839c5f446 - main - www/firefox: fix build on i386 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: 0e5839c5f4464fbce310362b973101753f73e4be Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661030599; 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=BlLDQsFDhvzZmNCXJddGqEklYDURlPvKoMi/0gHXCbU=; b=ZsMc3h58jq/RGpF4vIxNIJo4BSmtmMLJDvUE+Xs+fqfmBS6wL86tQtfdjVBx6EVsEMI7GX c5xlITNae/PYXVvUDtG1s0QFp9Rtdd8hG39yoKVhmTWiEVzi4HRVx3QY20E1boKPnIurWQ ZeBEUVKdJ9iVbxPB9+CHtZrPcoc3yI3fXLDKzR7boXi2dApmH7t6u6yj9o2h9Mqq/3FyNP fpJJTKN1LoUx4Yz2UHnUKyWxIlY+NsEhLUdLVFpAu7P/DwqgnNRNh74699q7CARPBWEyz+ JbSjzNE18aHf75gBAZUV+FrWaLgMj9rVKQrp/TccwMUDXpfM1NUlARNVyNBcZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661030599; a=rsa-sha256; cv=none; b=vwJgLL7/NrhgOMHq3cuD0x1jYdso1in7BM1F/VM/c/gKTwDUppeL7syMr4v2RpqLddmREA iueXHwPsu7ajTPeRVlFPLOfAIoQ/snHDXzuetu9UmerxpHtFCE9u3R/R159nLFj7OPenfM gQy8IRr0DZVkIaplNZcCRkjKECf3Z37Emr8s3xqpPUQMdz9X9eOk86yzhLPY7XKzW214yO gJ/dIeMBhUQv/ZGWNBRSLwCxAios/UWD5GZa234iA5S6jZKF1+J2bm7hp1L4i4qO0ivmMr lKrUk5zihstz07s8Jo29+n2COBe5jyDdV7qmVaI4eJyCIU5hq2+dvuFHiP2TPg== 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=0e5839c5f4464fbce310362b973101753f73e4be commit 0e5839c5f4464fbce310362b973101753f73e4be Author: Christoph Moench-Tegeder AuthorDate: 2022-08-20 21:20:00 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2022-08-20 21:20:00 +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). --- 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_;