Up to 5.7.35-38.1; drop part of opt.patch - our rpmcflags etc seem to be used correctly

diff --git a/build.patch b/build.patch
index c89697ac5596ff29206dfd10f7d55e1eb1a16a12..b5a14499c0fd29c1881c5e9cf6e213d1a9103207 100644 (file)
--- a/build.patch
+++ b/build.patch
@@ -1,15 +1,14 @@
 --- percona-server-5.7.29-32/storage/rocksdb/CMakeLists.txt~   2020-01-20 15:25:37.000000000 +0100
 +++ percona-server-5.7.29-32/storage/rocksdb/CMakeLists.txt    2020-02-17 10:50:15.600870732 +0100
-@@ -124,7 +124,7 @@ ENDIF()
- # get a list of rocksdb library source files
- # run with env -i to avoid passing variables
- EXECUTE_PROCESS(
--  COMMAND env -i ${CMAKE_CURRENT_SOURCE_DIR}/get_rocksdb_files.sh
-+  COMMAND env -i PATH=$ENV{PATH} ${CMAKE_CURRENT_SOURCE_DIR}/get_rocksdb_files.sh
-   OUTPUT_VARIABLE SCRIPT_OUTPUT
-   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
-
+@@ -57,7 +57,7 @@ ELSE()
+   # get a list of rocksdb library source files
+   # run with env -i to avoid passing variables
+   EXECUTE_PROCESS(
+-    COMMAND env -i ${CMAKE_CURRENT_SOURCE_DIR}/get_rocksdb_files.sh
++    COMMAND env -i PATH=$ENV{PATH} ${CMAKE_CURRENT_SOURCE_DIR}/get_rocksdb_files.sh
+     OUTPUT_VARIABLE SCRIPT_OUTPUT
+     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+   )
 From 9dddf90bf54cfa29d14d199d19ad07d4590fbb1e Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Thu, 30 Apr 2020 22:55:34 +0200
@@ -24,26 +23,23 @@ diff --git a/cmake/maintainer.cmake b/cmake/maintainer.cmake
 index 19db0d34f..3ed806be4 100644
 --- a/cmake/maintainer.cmake
 +++ b/cmake/maintainer.cmake
-@@ -46,12 +46,6 @@ IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+@@ -37,12 +37,6 @@ IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang"
        "${MY_CXX_WARNING_FLAGS} -Wno-null-conversion -Wno-unused-private-field")
  ENDIF()
  
 -# Turn on Werror (warning => error) when using maintainer mode.
 -IF(MYSQL_MAINTAINER_MODE)
--  SET(MY_C_WARNING_FLAGS "${MY_C_WARNING_FLAGS} -Werror")
--  SET(MY_CXX_WARNING_FLAGS "${MY_CXX_WARNING_FLAGS} -Werror")
+-  STRING_APPEND(MY_C_WARNING_FLAGS   " -Werror")
+-  STRING_APPEND(MY_CXX_WARNING_FLAGS " -Werror")
 -ENDIF()
 -
  # Set warning flags for GCC/Clang
  IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_WARNING_FLAGS}")
--- 
-2.26.2
-
+   STRING_APPEND(CMAKE_C_FLAGS " ${MY_C_WARNING_FLAGS}")
 --- percona-server-5.7.30-33/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake~   2020-05-13 23:04:03.000000000 +0200
 +++ percona-server-5.7.30-33/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake    2020-05-24 18:33:01.759229294 +0200
-@@ -170,10 +170,6 @@ if (NOT CMAKE_CXX_COMPILER_ID STREQUAL C
-   prepend_cflags_if_supported(-Wcast-align)
+@@ -221,10 +221,6 @@ if (NOT CMAKE_CXX_COMPILER_ID STREQUAL C
+   prepend_cflags_if_supported_remove_unsupported(-Wcast-align)
  endif ()
  
 -## always want these

diff --git a/mysql-opt.patch b/mysql-opt.patch
index 25105fd0fa63d2a640567de28e123166cd478275..9d1a36aecc7691522077210ec285ab9c4716cccd 100644 (file)
--- a/mysql-opt.patch
+++ b/mysql-opt.patch
@@ -24,39 +24,4 @@ diff -urNp -x '*.orig' percona-server-5.7.31-34.org/cmake/build_configurations/c
      ENDIF()
    ENDIF()
  
-@@ -71,8 +71,8 @@ IF(UNIX)
-     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 -D_FORTIFY_SOURCE=2 ${COMMON_C_FLAGS}")
-+    SET(CMAKE_C_FLAGS_DEBUG          "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
-+    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
-   ENDIF()
-   IF(CMAKE_COMPILER_IS_GNUCXX)
-     SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
-@@ -108,8 +108,8 @@ IF(UNIX)
-   # 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 -D_FORTIFY_SOURCE=2 ${COMMON_C_FLAGS}")
-+    SET(CMAKE_C_FLAGS_DEBUG          "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
-+    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${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")
-@@ -153,10 +153,10 @@ IF(UNIX)
- 
-       SET(COMMON_C_FLAGS            "-g ${SUNPRO_FLAGS}")
-       SET(COMMON_CXX_FLAGS          "-g0 ${SUNPRO_FLAGS}")
--      SET(COMMON_CXX_FLAGS          "${COMMON_CXX_FLAGS} -std=c++03")
--      SET(CMAKE_C_FLAGS_DEBUG       "${COMMON_C_FLAGS}")
-+      SET(COMMON_CXX_FLAGS          "${COMMON_CXX_FLAGS} -std=c++11")
-+      SET(CMAKE_C_FLAGS_DEBUG       "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
-       SET(CMAKE_CXX_FLAGS_DEBUG     "${COMMON_CXX_FLAGS}")
--      SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-xO3 ${COMMON_C_FLAGS}")
-+      SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-xO3 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
-       SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-xO3 ${COMMON_CXX_FLAGS}")
-     ENDIF()
-   ENDIF()
+

diff --git a/percona-server.spec b/percona-server.spec
index 95396988d34e63866107d5dd71e6311466fe7f69..c3ef4339a3406a56a8116f9887a6f4debfa5dd08 100644 (file)
--- a/percona-server.spec
+++ b/percona-server.spec
@@ -48,8 +48,8 @@
 %undefine      with_coredumper
 %endif
 
-%define                rel     4
-%define                percona_rel     34
+%define                rel     1
+%define                percona_rel     38
 Summary:       Percona Server: a very fast and reliable SQL database engine
 Summary(de.UTF-8):     Percona Server: ist eine SQL-Datenbank
 Summary(fr.UTF-8):     Percona Server: un serveur SQL rapide et fiable
@@ -59,12 +59,12 @@ Summary(ru.UTF-8):  Percona Server - быстрый SQL-сервер
 Summary(uk.UTF-8):     Percona Server - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  Percona Server数据库服务器
 Name:          percona-server
-Version:       5.7.31
+Version:       5.7.35
 Release:       %{percona_rel}.%{rel}
 License:       GPL + Percona Server FLOSS Exception
 Group:         Applications/Databases
 Source0:       https://www.percona.com/downloads/Percona-Server-5.7/LATEST/source/tarball/%{name}-%{version}-%{percona_rel}.tar.gz
-# Source0-md5: 456b9fb28f2d6c72f135c114e5811808
+# Source0-md5: 61359c10adbfef3f5d2d8284a0d5031a
 Source100:     http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
 # Source100-md5:       5cac34f3d78a9d612ca4301abfcbd666
 %if %{without system_boost}