]> TLD Linux GIT Repositories - packages/mysql.git/blob - mysql-opt.patch
- fix zlib library being listed as incorrect -lzlib instead of -lz
[packages/mysql.git] / mysql-opt.patch
1 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
2 --- percona-server-5.7.35-38.orig/cmake/build_configurations/compiler_options.cmake     2021-11-24 18:56:51.570445147 +0100
3 +++ percona-server-5.7.35-38/cmake/build_configurations/compiler_options.cmake  2021-11-24 19:35:58.389983145 +0100
4 @@ -32,17 +32,17 @@
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 @@ -166,13 +166,13 @@
28        ENDIF()
29  
30        SET(COMMON_C_FLAGS            "-g ${SUNPRO_FLAGS}")
31 -      SET(COMMON_CXX_FLAGS          "-g0 ${SUNPRO_FLAGS} -std=c++03")
32 +      SET(COMMON_CXX_FLAGS          "-g0 ${SUNPRO_FLAGS} -std=c++11")
33        # For SunPro, append our own flags rather than prepending below.
34        # We need -g0 and the misc -x flags above to reduce the size of binaries.
35 -      STRING_APPEND(CMAKE_C_FLAGS_DEBUG            " ${COMMON_C_FLAGS}")
36 -      STRING_APPEND(CMAKE_CXX_FLAGS_DEBUG          " ${COMMON_CXX_FLAGS}")
37 -      STRING_APPEND(CMAKE_C_FLAGS_RELWITHDEBINFO   " -xO3 ${COMMON_C_FLAGS}")
38 -      STRING_APPEND(CMAKE_CXX_FLAGS_RELWITHDEBINFO " -xO3 ${COMMON_CXX_FLAGS}")
39 +      STRING_APPEND(CMAKE_C_FLAGS_DEBUG            " ${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
40 +      STRING_APPEND(CMAKE_CXX_FLAGS_DEBUG          " ${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
41 +      STRING_APPEND(CMAKE_C_FLAGS_RELWITHDEBINFO   " -O3 -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
42 +      STRING_APPEND(CMAKE_CXX_FLAGS_RELWITHDEBINFO " -O3 -D_FORTIFY_SOURCE=2 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}")
43        STRING_APPEND(CMAKE_C_FLAGS_RELEASE          " -xO3 ${COMMON_C_FLAGS}")
44        STRING_APPEND(CMAKE_CXX_FLAGS_RELEASE        " -xO3 ${COMMON_CXX_FLAGS}")
45        STRING_APPEND(CMAKE_C_FLAGS_MINSIZEREL       " -xO3 ${COMMON_C_FLAGS}")