- rediff patches

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

diff --git a/mysql-opt.patch b/mysql-opt.patch
index 462f67b67e2c7a35d7e308ba8c08eb4243d8ef4a..25105fd0fa63d2a640567de28e123166cd478275 100644 (file)
--- a/mysql-opt.patch
+++ b/mysql-opt.patch
@@ -1,26 +1,62 @@
---- mysql-3.23.32/configure.in.orig    Sat Feb 10 02:57:16 2001
-+++ mysql-3.23.32/configure.in Sat Feb 10 03:21:04 2001
-@@ -1094,17 +1094,17 @@
- if test "$with_debug" = "yes"
- then
-   # Medium debug.
--  CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DDBUG_ON -DSAFE_MUTEX $CFLAGS"
--  CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS"
-+  CFLAGS="-DDBUG_ON -DSAFE_MUTEX $CFLAGS"
-+  CXXFLAGS="-DSAFE_MUTEX $CXXFLAGS"
- elif test "$with_debug" = "full"
- then
-   # Full debug. Very slow in some cases
--  CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"
--  CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"
-+  CFLAGS="-DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"
-+  CXXFLAGS="-DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"
- else
-   # Optimized version. No debug
--  CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS"
--  CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS"
-+  CFLAGS="-DDBUG_OFF $CFLAGS"
-+  CXXFLAGS="-DDBUG_OFF $CXXFLAGS"
- fi
+diff -urNp -x '*.orig' percona-server-5.7.31-34.org/cmake/build_configurations/compiler_options.cmake percona-server-5.7.31-34/cmake/build_configurations/compiler_options.cmake
+--- percona-server-5.7.31-34.org/cmake/build_configurations/compiler_options.cmake     2020-08-15 11:23:18.000000000 +0200
++++ percona-server-5.7.31-34/cmake/build_configurations/compiler_options.cmake 2021-05-26 15:13:06.336651991 +0200
+@@ -32,17 +32,17 @@ IF(SIZEOF_VOIDP EQUAL 8)
+   SET(64BIT 1)
+ ENDIF()
  
- # Force static compilation to avoid linking probles/get more speed
+-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()
+ 
+@@ -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()