mysql-opt.patch

   1 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
   2 --- percona-server-5.7.31-34.org/cmake/build_configurations/compiler_options.cmake      2020-08-15 11:23:18.000000000 +0200
   3 +++ percona-server-5.7.31-34/cmake/build_configurations/compiler_options.cmake  2021-05-26 15:13:06.336651991 +0200
   4 @@ -32,17 +32,17 @@ IF(SIZEOF_VOIDP EQUAL 8)
   5    SET(64BIT 1)
   6  ENDIF()
   7
   8 -SET(CMAKE_CXX_STANDARD 98)
   9 +SET(CMAKE_CXX_STANDARD 11)
  10
  11  # Compiler options
  12  IF(UNIX)
  13 -  MY_CHECK_CXX_COMPILER_FLAG("-std=gnu++03" GNU03_SUPPORTED)
  14 +  MY_CHECK_CXX_COMPILER_FLAG("-std=gnu++11" GNU11_SUPPORTED)
  15
  16 -  IF(GNU03_SUPPORTED)
  17 +  IF(GNU11_SUPPORTED)
  18      IF(CMAKE_VERSION VERSION_LESS 3.1.0)
  19 -      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++03")
  20 +      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
  21      ELSE()
  22 -      SET(CMAKE_CXX98_EXTENSION_COMPILE_OPTION -std=gnu++03)
  23 +      SET(CMAKE_CXX11_EXTENSION_COMPILE_OPTION -std=gnu++11)
  24      ENDIF()
  25    ENDIF()
  26
  27 @@ -71,8 +71,8 @@ IF(UNIX)
  28      IF(C_NO_EXPENSIVE_OPTIMIZATIONS)
  29        SET(COMMON_C_FLAGS "${COMMON_C_FLAGS} -fno-expensive-optimizations")
  30      ENDIF()
  31 -    SET(CMAKE_C_FLAGS_DEBUG          "${COMMON_C_FLAGS}")
  32 -    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${COMMON_C_FLAGS}")
  33 +    SET(CMAKE_C_FLAGS_DEBUG          "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
  34 +    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
  35    ENDIF()
  36    IF(CMAKE_COMPILER_IS_GNUCXX)
  37      SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
  38 @@ -108,8 +108,8 @@ IF(UNIX)
  39    # Default Clang flags
  40    IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
  41      SET(COMMON_C_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
  42 -    SET(CMAKE_C_FLAGS_DEBUG          "${COMMON_C_FLAGS}")
  43 -    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${COMMON_C_FLAGS}")
  44 +    SET(CMAKE_C_FLAGS_DEBUG          "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
  45 +    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
  46    ENDIF()
  47    IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
  48      SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
  49 @@ -153,10 +153,10 @@ IF(UNIX)
  50
  51        SET(COMMON_C_FLAGS            "-g ${SUNPRO_FLAGS}")
  52        SET(COMMON_CXX_FLAGS          "-g0 ${SUNPRO_FLAGS}")
  53 -      SET(COMMON_CXX_FLAGS          "${COMMON_CXX_FLAGS} -std=c++03")
  54 -      SET(CMAKE_C_FLAGS_DEBUG       "${COMMON_C_FLAGS}")
  55 +      SET(COMMON_CXX_FLAGS          "${COMMON_CXX_FLAGS} -std=c++11")
  56 +      SET(CMAKE_C_FLAGS_DEBUG       "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
  57        SET(CMAKE_CXX_FLAGS_DEBUG     "${COMMON_CXX_FLAGS}")
  58 -      SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-xO3 ${COMMON_C_FLAGS}")
  59 +      SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-xO3 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
  60        SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-xO3 ${COMMON_CXX_FLAGS}")
  61      ENDIF()
  62    ENDIF()