Up to 5.7.36; drop parts of opt patch (our cflags seem to be used correctly); lz4...

diff --git a/lz4.patch b/lz4.patch
deleted file mode 100644 (file)
index 7b60e84..0000000
--- a/lz4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mysql-5.7.22/extra/lz4_decompress.cc~      2018-03-04 14:40:40.000000000 +0100
-+++ mysql-5.7.22/extra/lz4_decompress.cc       2018-06-02 00:47:44.437818669 +0200
-@@ -18,7 +18,7 @@
- #include <my_global.h>
- #include <welcome_copyright_notice.h>
- 
--#include "lz4/lz4frame.h"
-+#include <lz4frame.h>
- #include <string.h>
- 
- static void usage()

diff --git a/mysql-opt.patch b/mysql-opt.patch
index b48ce5d3278c161139a4593adacfddc194ef39f6..a6b9ec7da61415d0130f3350c18dff7106ae6aa9 100644 (file)
--- a/mysql-opt.patch
+++ b/mysql-opt.patch
@@ -1,57 +1,11 @@
---- 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}")
-+    SET(CMAKE_C_FLAGS_DEBUG          "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
-+    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
-   ENDIF()
-   IF(CMAKE_COMPILER_IS_GNUCXX)
-     SET(COMMON_CXX_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-@@ -59,7 +59,7 @@
+--- mysql-5.7.36/cmake/build_configurations/compiler_options.cmake~    2021-09-07 07:26:47.000000000 +0200
++++ mysql-5.7.36/cmake/build_configurations/compiler_options.cmake     2021-11-29 07:46:49.013266334 +0100
+@@ -73,7 +73,7 @@ IF(UNIX)
      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")
+-      STRING_PREPEND(COMMON_CXX_FLAGS "-std=gnu++03 ")
++      STRING_PREPEND(COMMON_CXX_FLAGS "-std=gnu++11 ")
      ENDIF()
      # Disable inline optimizations for valgrind testing to avoid false positives
      IF(WITH_VALGRIND)
-@@ -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}")
-+    SET(CMAKE_CXX_FLAGS_DEBUG          "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
-+    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}")
-   ENDIF()
- 
-   # Default Clang flags
-   IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
-     SET(COMMON_C_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
--    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_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}")
-+    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}")
-   ENDIF()
- 
-   # Solaris flags

diff --git a/mysql.spec b/mysql.spec
index 1d29e6bcd8297dcadc9302ba65bb594ec120f998..8d6c188b3c8a04c7aad4ad3504baa517a70d6e42 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -35,13 +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.31
-Release:       2
+Version:       5.7.36
+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: 2b0039d0fe510c9d768a3eb1ae923fbf
+# Source0-md5: b5884df310dad829b4c565e12d2c2092
 Source100:     http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
 # Source100-md5:       5cac34f3d78a9d612ca4301abfcbd666
 %if %{without system_boost}
@@ -62,7 +62,7 @@ Source12:     %{name}-ndb-cpc.sysconfig
 Source13:      %{name}-client.conf
 Source14:      my.cnf
 Patch0:                %{name}-opt.patch
-Patch1:                lz4.patch
+
 Patch2:                %{name}-protobuf.patch
 Patch3:                %{name}-5.7-sphinx.patch
 Patch4:                %{name}-sphinx.patch
@@ -467,7 +467,7 @@ Ten pakiet zawiera standardowego demona MySQL NDB CPC.
 %setup -q %{?with_sphinx:-a100} %{!?with_system_boost:-a101}
 
 %patch0 -p1
-%patch1 -p1
+
 %patch2 -p1
 %if %{with sphinx}
 # http://www.sphinxsearch.com/docs/manual-0.9.9.html#sphinxse-mysql51
@@ -488,7 +488,7 @@ Ten pakiet zawiera standardowego demona MySQL NDB CPC.
 
 # ensure sytstem lib
 # need to keep xxhash.[ch]
-%{__rm} -rv extra/lz4/lz4**
+%{__rm} -rv extra/lz4/lz4*/lz4*
 
 %build
 install -d build