aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPo-Chuan Hsieh <sunpoet@FreeBSD.org>2022-04-16 14:07:40 +0000
committerPo-Chuan Hsieh <sunpoet@FreeBSD.org>2022-04-16 14:07:40 +0000
commit58cf46db4d7a55d4d2eb35b82dbe957bb67028f4 (patch)
tree0aa9528f74a9fe1da7afc14448392263a4e1bbe8
parentdc1e57cf9170bfb3f7f29af852dd3e03d5c2db5b (diff)
downloadports-58cf46db4d7a55d4d2eb35b82dbe957bb67028f4.tar.gz
ports-58cf46db4d7a55d4d2eb35b82dbe957bb67028f4.zip
devel/protobuf: Fix build on i386 (workaround)
-rw-r--r--devel/protobuf/files/patch-i38614
1 files changed, 14 insertions, 0 deletions
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