[packages/mysql] - updated to 5.7.27 - updated opt patch - added protobuf patch (fixes build with protobuf >= 3.8.0)
qboosh
qboosh at pld-linux.org
Mon Jul 29 21:05:55 CEST 2019
commit 792fb8bd8ed243d597ef2b80537a022f9130559b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Jul 29 21:07:51 2019 +0200
- updated to 5.7.27
- updated opt patch
- added protobuf patch (fixes build with protobuf >= 3.8.0)
mysql-opt.patch | 44 +++++++++++++++++++++++++-------------------
mysql-protobuf.patch | 12 ++++++++++++
mysql.spec | 13 ++++++++-----
3 files changed, 45 insertions(+), 24 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index d0b583b..3afbf28 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -35,12 +35,13 @@ Summary(ru.UTF-8): MySQL - быстрый SQL-сервер
Summary(uk.UTF-8): MySQL - швидкий SQL-сервер
Summary(zh_CN.UTF-8): MySQL数据库服务器
Name: mysql
-Version: 5.7.24
-Release: 3
-License: GPL + MySQL FLOSS Exception
+Version: 5.7.27
+Release: 1
+License: GPL v2 + MySQL FOSS License Exception
Group: Applications/Databases
+#Source0Download: https://dev.mysql.com/downloads/mysql/5.7.html#downloads
Source0: http://cdn.mysql.com/Downloads/MySQL-5.7/%{name}-%{version}.tar.gz
-# Source0-md5: 74de56f90a0f0a8496fe84b27117f32a
+# Source0-md5: d5eece21695f157cfbf87a75175973cd
Source100: http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
# Source100-md5: 5cac34f3d78a9d612ca4301abfcbd666
%if %{without system_boost}
@@ -62,6 +63,7 @@ Source13: %{name}-client.conf
Source14: my.cnf
Patch0: %{name}-opt.patch
Patch1: lz4.patch
+Patch2: %{name}-protobuf.patch
Patch17: %{name}-5.7-sphinx.patch
Patch18: %{name}-sphinx.patch
@@ -466,10 +468,11 @@ Ten pakiet zawiera standardowego demona MySQL NDB CPC.
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%if %{with sphinx}
# http://www.sphinxsearch.com/docs/manual-0.9.9.html#sphinxse-mysql51
-mv sphinx-*/mysqlse storage/sphinx
+%{__mv} sphinx-*/mysqlse storage/sphinx
%patch17 -p1
%patch18 -p1
%endif
diff --git a/mysql-opt.patch b/mysql-opt.patch
index 2fade21..b48ce5d 100644
--- a/mysql-opt.patch
+++ b/mysql-opt.patch
@@ -1,8 +1,8 @@
---- percona-server-5.6.24-72.2/cmake/build_configurations/compiler_options.cmake.orig 2015-05-06 12:38:47.000000000 +0200
-+++ percona-server-5.6.24-72.2/cmake/build_configurations/compiler_options.cmake 2015-06-09 19:54:42.577790251 +0200
-@@ -30,8 +30,8 @@
- IF(WITH_VALGRIND)
- SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}")
+--- mysql-5.7.27/cmake/build_configurations/compiler_options.cmake.orig 2019-06-10 16:43:20.000000000 +0200
++++ mysql-5.7.27/cmake/build_configurations/compiler_options.cmake 2019-07-29 05:55:55.892824445 +0200
+@@ -50,8 +50,8 @@
+ IF(C_NO_EXPENSIVE_OPTIMIZATIONS)
+ SET(COMMON_C_FLAGS "${COMMON_C_FLAGS} -fno-expensive-optimizations")
ENDIF()
- SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}")
- SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
@@ -11,9 +11,18 @@
ENDIF()
IF(CMAKE_COMPILER_IS_GNUCXX)
SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-@@ -39,20 +39,20 @@
+@@ -59,7 +59,7 @@
+ EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
+ OUTPUT_VARIABLE GXX_VERSION)
+ IF(GXX_VERSION VERSION_EQUAL 6.0 OR GXX_VERSION VERSION_GREATER 6.0)
+- SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=gnu++03")
++ SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=gnu++11")
+ ENDIF()
+ # Disable inline optimizations for valgrind testing to avoid false positives
IF(WITH_VALGRIND)
- SET(COMMON_CXX_FLAGS "-fno-inline ${COMMON_CXX_FLAGS}")
+@@ -80,15 +80,15 @@
+ IF(CXX_NO_EXPENSIVE_OPTIMIZATIONS)
+ SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -fno-expensive-optimizations")
ENDIF()
- SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}")
- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
@@ -27,10 +36,18 @@
- SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}")
- SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
-+ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
++ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
ENDIF()
IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+@@ -95,11 +95,11 @@
+ IF(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 6.0 OR
+ CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0)
+ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+- SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=gnu++03")
++ SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=gnu++11")
+ ENDIF()
+ ENDIF()
- SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}")
- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
+ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
@@ -38,14 +55,3 @@
ENDIF()
# Solaris flags
---- mysql-5.7.23/cmake/build_configurations/compiler_options.cmake.orig 2018-10-13 21:39:26.928696351 +0200
-+++ mysql-5.7.23/cmake/build_configurations/compiler_options.cmake 2018-10-13 22:14:21.388672435 +0200
-@@ -59,7 +59,7 @@
- EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
- OUTPUT_VARIABLE GXX_VERSION)
- IF(GXX_VERSION VERSION_EQUAL 6.0 OR GXX_VERSION VERSION_GREATER 6.0)
-- SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=gnu++03")
-+ SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=gnu++11")
- ENDIF()
- # Disable inline optimizations for valgrind testing to avoid false positives
- IF(WITH_VALGRIND)
diff --git a/mysql-protobuf.patch b/mysql-protobuf.patch
new file mode 100644
index 0000000..cce64d4
--- /dev/null
+++ b/mysql-protobuf.patch
@@ -0,0 +1,12 @@
+--- mysql-5.7.27/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h.orig 2019-06-10 16:43:20.000000000 +0200
++++ mysql-5.7.27/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h 2019-07-29 19:19:29.421629353 +0200
+@@ -29,7 +29,9 @@
+ #include <google/protobuf/io/tokenizer.h>
+ #include <google/protobuf/io/zero_copy_stream.h>
+ #include <google/protobuf/wire_format_lite.h>
++#if GOOGLE_PROTOBUF_VERSION < 3008000
+ #include <google/protobuf/wire_format_lite_inl.h>
++#endif
+ #include <google/protobuf/dynamic_message.h>
+
+ #include "mysqlx_connection.pb.h"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/792fb8bd8ed243d597ef2b80537a022f9130559b
More information about the pld-cvs-commit
mailing list