1 diff -ur percona-server-5.7.28-31.orig/cmake/build_configurations/compiler_options.cmake percona-server-5.7.28-31/cmake/build_configurations/compiler_options.cmake
2 --- percona-server-5.7.28-31.orig/cmake/build_configurations/compiler_options.cmake 2019-12-16 22:33:24.884000000 +0100
3 +++ percona-server-5.7.28-31/cmake/build_configurations/compiler_options.cmake 2019-12-16 22:34:14.208000000 +0100
8 -SET(CMAKE_CXX_STANDARD 98)
9 +SET(CMAKE_CXX_STANDARD 11)
13 - MY_CHECK_CXX_COMPILER_FLAG("-std=gnu++03" GNU03_SUPPORTED)
14 + MY_CHECK_CXX_COMPILER_FLAG("-std=gnu++11" 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")
22 - SET(CMAKE_CXX98_EXTENSION_COMPILE_OPTION -std=gnu++03)
23 + SET(CMAKE_CXX11_EXTENSION_COMPILE_OPTION -std=gnu++11)
28 IF(C_NO_EXPENSIVE_OPTIMIZATIONS)
29 SET(COMMON_C_FLAGS "${COMMON_C_FLAGS} -fno-expensive-optimizations")
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}")
36 IF(CMAKE_COMPILER_IS_GNUCXX)
37 SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
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}")
47 IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
48 SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
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}")