- drop patches:
* 10355.patch, * gcc12-disable-__constinit-with-c++-11.patch (merged upstream) - added patches: * add-missing-stdint-header.patch added for compile fixes OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=154
This commit is contained in:
parent
b26df6bb84
commit
805fd49fad
@ -1,16 +0,0 @@
|
||||
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
|
@ -27,8 +27,11 @@ Mon Apr 24 12:30:51 UTC 2023 - Adrian Schröter <adrian@suse.de>
|
||||
- python sub packages version is set 4.22.3 as defined in
|
||||
python/google/protobuf/__init__.py to stay compatible
|
||||
- skip python2 builds by default
|
||||
- 10355.patch got merged upstream
|
||||
- add-missing-stdint-header.patch added for compile fixes
|
||||
- drop patches:
|
||||
* 10355.patch,
|
||||
* gcc12-disable-__constinit-with-c++-11.patch (merged upstream)
|
||||
- added patches:
|
||||
* add-missing-stdint-header.patch added for compile fixes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 23 09:01:50 UTC 2023 - Martin Liška <mliska@suse.cz>
|
||||
|
@ -40,8 +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
|
||||
Patch0: add-missing-stdint-header.patch
|
||||
BuildRequires: %{python_module abseil}
|
||||
BuildRequires: %{python_module devel}
|
||||
BuildRequires: %{python_module python-dateutil}
|
||||
|
Loading…
Reference in New Issue
Block a user