forked from pool/protobuf
This commit is contained in:
parent
6abe767c86
commit
b26df6bb84
16
gcc12-disable-__constinit-with-c++-11.patch
Normal file
16
gcc12-disable-__constinit-with-c++-11.patch
Normal file
@ -0,0 +1,16 @@
|
||||
Index: protobuf-21.4/src/google/protobuf/port_def.inc
|
||||
===================================================================
|
||||
--- protobuf-21.4.orig/src/google/protobuf/port_def.inc
|
||||
+++ protobuf-21.4/src/google/protobuf/port_def.inc
|
||||
@@ -652,7 +652,11 @@
|
||||
#define PROTOBUF_CONSTINIT [[clang::require_constant_initialization]]
|
||||
#define PROTOBUF_CONSTEXPR constexpr
|
||||
#elif PROTOBUF_GNUC_MIN(12, 2)
|
||||
+#if PROTOBUF_CPLUSPLUS_MIN(201703L)
|
||||
#define PROTOBUF_CONSTINIT __constinit
|
||||
+#else
|
||||
+#define PROTOBUF_CONSTINIT
|
||||
+#endif
|
||||
#define PROTOBUF_CONSTEXPR constexpr
|
||||
// MSVC 17 currently seems to raise an error about constant-initialized pointers.
|
||||
#elif defined(_MSC_VER) && _MSC_VER >= 1930
|
@ -40,6 +40,7 @@ Source0: https://github.com/protocolbuffers/protobuf/archive/v%{version}.
|
||||
Source1: manifest.txt.in
|
||||
Source2: baselibs.conf
|
||||
Source1000: %{name}-rpmlintrc
|
||||
Patch0: gcc12-disable-__constinit-with-c++-11.patch
|
||||
Patch1: add-missing-stdint-header.patch
|
||||
BuildRequires: %{python_module abseil}
|
||||
BuildRequires: %{python_module devel}
|
||||
|
Loading…
x
Reference in New Issue
Block a user