diff --git a/packages/addons/addon-depends/protobuf/patches/9936.patch b/packages/addons/addon-depends/protobuf/patches/9936.patch new file mode 100644 index 0000000000..c85ee8884a --- /dev/null +++ b/packages/addons/addon-depends/protobuf/patches/9936.patch @@ -0,0 +1,24 @@ +From fc7dc129f19fec7fe3211a39f13f6fe74c35cce6 Mon Sep 17 00:00:00 2001 +From: Adam Cozzette +Date: Mon, 9 May 2022 19:03:39 +0000 +Subject: [PATCH] Use __constinit only in GCC 12.2 and up + +Fixes #9916. GCC appears to have a bug preventing our use of __constinit +from working correctly, but this bug will be fixed in GCC 12.2. +--- + src/google/protobuf/port_def.inc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc +index dcb0ff758f1..289a42674cf 100644 +--- a/src/google/protobuf/port_def.inc ++++ b/src/google/protobuf/port_def.inc +@@ -650,7 +650,7 @@ + (!defined(__APPLE__) && __clang_major__ >= 12)) + #define PROTOBUF_CONSTINIT [[clang::require_constant_initialization]] + #define PROTOBUF_CONSTEXPR constexpr +-#elif PROTOBUF_GNUC_MIN(12, 0) ++#elif PROTOBUF_GNUC_MIN(12, 2) + #define PROTOBUF_CONSTINIT __constinit + #define PROTOBUF_CONSTEXPR constexpr + #else