rpms/mysql
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Include patch to build against protobuf 3.11

Browse Source
This commit is contained in:
Adrian Reber 2019-12-19 07:54:02 +01:00
parent 994efdc87f
commit 420fa92a6f
No known key found for this signature in database
GPG Key ID: 82C9378ED3C4906A
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
community-mysql-protobuf-3-11.patch Normal file
View File

@ -0,0 +1,26 @@
Problem report: https://bugs.mysql.com/bug.php?id=97246
Patch source: https://github.com/Homebrew/homebrew-core/pull/45383/commits/4b4dfa1c153a05f1fd4b83c2df741f2dc5f43237
diff -urN a/plugin/x/client/mysqlxclient/xmessage.h b/plugin/x/client/mysqlxclient/xmessage.h
--- a/plugin/x/client/mysqlxclient/xmessage.h 2019-09-20 18:30:51.000000000 +1000
+++ b/plugin/x/client/mysqlxclient/xmessage.h 2019-10-16 09:12:15.000000000 +1000
@@ -36,7 +36,6 @@
#include <google/protobuf/repeated_field.h>
#include <google/protobuf/text_format.h>
#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/wire_format_lite_inl.h>
#ifdef USE_MYSQLX_FULL_PROTO
diff -urN a/plugin/x/ngs/include/ngs/protocol/protocol_protobuf.h b/plugin/x/ngs/include/ngs/protocol/protocol_protobuf.h
--- a/plugin/x/ngs/include/ngs/protocol/protocol_protobuf.h 2019-09-20 18:30:51.000000000 +1000
+++ b/plugin/x/ngs/include/ngs/protocol/protocol_protobuf.h 2019-10-16 09:11:27.000000000 +1000
@@ -38,7 +38,6 @@
#include <google/protobuf/repeated_field.h>
#include <google/protobuf/text_format.h>
#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/wire_format_lite_inl.h>
#ifdef USE_MYSQLX_FULL_PROTO
#include "plugin/x/generated/protobuf/mysqlx.pb.h"

9
community-mysql.spec
View File

@ -67,7 +67,7 @@
Name: community-mysql
Version: 8.0.18
Release: 5%{?with_debug:.debug}%{?dist}
Release: 6%{?with_debug:.debug}%{?dist}
Summary: MySQL client programs and shared libraries
URL: http://www.mysql.com
@ -106,6 +106,9 @@ Patch52: %{pkgnamepatch}-sharedir.patch
Patch55: %{pkgnamepatch}-rpath.patch
Patch75: %{pkgnamepatch}-arm32-timer.patch
# Patch to build against protobuf-3.11
Patch76: %{pkgnamepatch}-protobuf-3-11.patch
# Patches taken from boost 1.59
Patch115: boost-1.58.0-pool.patch
Patch125: boost-1.57.0-mpl-print.patch
@ -352,6 +355,7 @@ the MySQL sources.
%patch52 -p1
%patch55 -p1
%patch75 -p1
%patch76 -p1
# Patch Boost
pushd boost/boost_1_??_0
@ -802,6 +806,9 @@ fi
%endif
%changelog
* Thu Dec 19 2019 Adrian Reber <adrian@lisas.de> - 8.0.18-6
- Include patch to build against protobuf 3.11
* Thu Dec 19 2019 Orion Poplawski <orion@nwra.com> - 8.0.18-5
- Rebuild for protobuf 3.11