git: 58cf46db4d7a - main - devel/protobuf: Fix build on i386 (workaround)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 16 Apr 2022 14:07:47 UTC
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=58cf46db4d7a55d4d2eb35b82dbe957bb67028f4 commit 58cf46db4d7a55d4d2eb35b82dbe957bb67028f4 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2022-04-16 14:07:40 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2022-04-16 14:07:40 +0000 devel/protobuf: Fix build on i386 (workaround) Reference: https://github.com/protocolbuffers/protobuf/issues/9792 http://pb2.nyi.freebsd.org/data/123i386-default-foo/2022-04-16_08h34m58s/logs/errors/protobuf-3.20.0,1.log Reported by: antoine --- devel/protobuf/files/patch-i386 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/devel/protobuf/files/patch-i386 b/devel/protobuf/files/patch-i386 new file mode 100644 index 000000000000..401026930a2e --- /dev/null +++ b/devel/protobuf/files/patch-i386 @@ -0,0 +1,14 @@ +Reference: https://github.com/protocolbuffers/protobuf/issues/9792 + http://pb2.nyi.freebsd.org/data/123i386-default-foo/2022-04-16_08h34m58s/logs/errors/protobuf-3.20.0,1.log + +--- src/google/protobuf/arenastring.cc.orig 2022-03-25 21:52:12 UTC ++++ src/google/protobuf/arenastring.cc +@@ -64,7 +64,7 @@ constexpr size_t kNewAlign = alignof(std::max_align_t) + #endif + constexpr size_t kStringAlign = alignof(std::string); + +-static_assert((kStringAlign > kNewAlign ? kStringAlign : kNewAlign) >= 8, ""); ++//static_assert((kStringAlign > kNewAlign ? kStringAlign : kNewAlign) >= 8, ""); + static_assert(alignof(ExplicitlyConstructedArenaString) >= 8, ""); + + } // namespace