- keep common dirs for mysqlrouter in mysql-common, fix /var/{lib,log} dirs

[packages/mysql.git] / mysql-opt.patch

diff --git a/mysql-opt.patch b/mysql-opt.patch
deleted file mode 100644 (file)
index 766dda8..0000000
--- a/mysql-opt.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ur percona-server-5.7.35-38.orig/cmake/build_configurations/compiler_options.cmake percona-server-5.7.35-38/cmake/build_configurations/compiler_options.cmake
---- percona-server-5.7.35-38.orig/cmake/build_configurations/compiler_options.cmake    2021-11-24 18:56:51.570445147 +0100
-+++ percona-server-5.7.35-38/cmake/build_configurations/compiler_options.cmake 2021-11-24 19:35:58.389983145 +0100
-@@ -32,17 +32,17 @@
-   SET(64BIT 1)
- ENDIF()
- 
--SET(CMAKE_CXX_STANDARD 98)
-+SET(CMAKE_CXX_STANDARD 11)
-  
- # Compiler options
- IF(UNIX)  
--  MY_CHECK_CXX_COMPILER_FLAG("-std=gnu++03" GNU03_SUPPORTED)
-+  MY_CHECK_CXX_COMPILER_FLAG("-std=gnu++11" GNU11_SUPPORTED)
- 
--  IF(GNU03_SUPPORTED)
-+  IF(GNU11_SUPPORTED)
-     IF(CMAKE_VERSION VERSION_LESS 3.1.0)
--      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++03")
-+      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
-     ELSE()
--      SET(CMAKE_CXX98_EXTENSION_COMPILE_OPTION -std=gnu++03)
-+      SET(CMAKE_CXX11_EXTENSION_COMPILE_OPTION -std=gnu++11)
-     ENDIF()
-   ENDIF()
- 
-@@ -166,13 +166,13 @@
-       ENDIF()
- 
-       SET(COMMON_C_FLAGS            "-g ${SUNPRO_FLAGS}")
--      SET(COMMON_CXX_FLAGS          "-g0 ${SUNPRO_FLAGS} -std=c++03")
-+      SET(COMMON_CXX_FLAGS          "-g0 ${SUNPRO_FLAGS} -std=c++11")
-       # For SunPro, append our own flags rather than prepending below.
-       # We need -g0 and the misc -x flags above to reduce the size of binaries.
--      STRING_APPEND(CMAKE_C_FLAGS_DEBUG            " ${COMMON_C_FLAGS}")
--      STRING_APPEND(CMAKE_CXX_FLAGS_DEBUG          " ${COMMON_CXX_FLAGS}")
--      STRING_APPEND(CMAKE_C_FLAGS_RELWITHDEBINFO   " -xO3 ${COMMON_C_FLAGS}")
--      STRING_APPEND(CMAKE_CXX_FLAGS_RELWITHDEBINFO " -xO3 ${COMMON_CXX_FLAGS}")
-+      STRING_APPEND(CMAKE_C_FLAGS_DEBUG            " ${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
-+      STRING_APPEND(CMAKE_CXX_FLAGS_DEBUG          " ${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
-+      STRING_APPEND(CMAKE_C_FLAGS_RELWITHDEBINFO   " -O3 -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
-+      STRING_APPEND(CMAKE_CXX_FLAGS_RELWITHDEBINFO " -O3 -D_FORTIFY_SOURCE=2 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}")
-       STRING_APPEND(CMAKE_C_FLAGS_RELEASE          " -xO3 ${COMMON_C_FLAGS}")
-       STRING_APPEND(CMAKE_CXX_FLAGS_RELEASE        " -xO3 ${COMMON_CXX_FLAGS}")
-       STRING_APPEND(CMAKE_C_FLAGS_MINSIZEREL       " -xO3 ${COMMON_C_FLAGS}")