1 --- percona-server-5.7.12-5/cmake/build_configurations/compiler_options.cmake~ 2016-06-19 22:55:34.000000000 +0300
2 +++ percona-server-5.7.12-5/cmake/build_configurations/compiler_options.cmake 2016-06-19 22:58:00.531159698 +0300
5 SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}")
7 - SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}")
8 - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${COMMON_C_FLAGS}")
9 + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
10 + SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
12 IF(CMAKE_COMPILER_IS_GNUCXX)
13 SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
16 SET(COMMON_CXX_FLAGS "-fno-inline ${COMMON_CXX_FLAGS}")
18 - SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}")
19 - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${COMMON_CXX_FLAGS}")
20 + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
21 + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}")
25 IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
26 SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
27 - SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}")
28 - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${COMMON_C_FLAGS}")
29 + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
30 + SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
32 IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
33 SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
34 - SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}")
35 - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${COMMON_CXX_FLAGS}")
36 + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
37 + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}")
42 --- percona-server-5.7.23-23/cmake/build_configurations/compiler_options.cmake.orig 2018-10-14 08:44:45.291573886 +0200
43 +++ percona-server-5.7.23-23/cmake/build_configurations/compiler_options.cmake 2018-10-14 08:44:55.181573772 +0200
48 -SET(CMAKE_CXX_STANDARD 98)
49 +SET(CMAKE_CXX_STANDARD 11)
53 - MY_CHECK_CXX_COMPILER_FLAG("-std=gnu++03" GNU03_SUPPORTED)
54 + MY_CHECK_CXX_COMPILER_FLAG("-std=gnu++11" GNU11_SUPPORTED)
58 IF(CMAKE_VERSION VERSION_LESS 3.1.0)
59 - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++03")
60 + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
62 - SET(CMAKE_CXX98_EXTENSION_COMPILE_OPTION -std=gnu++03)
63 + SET(CMAKE_CXX11_EXTENSION_COMPILE_OPTION -std=gnu++11)
69 SET(COMMON_C_FLAGS "-g ${SUNPRO_FLAGS}")
70 SET(COMMON_CXX_FLAGS "-g0 ${SUNPRO_FLAGS}")
71 - SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=c++03")
72 + SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=c++11")
73 SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}")
74 SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}")
75 SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-xO3 ${COMMON_C_FLAGS}")