X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=mysql-opt.patch;h=766dda85981d6ad1209b7606cb46dd677ad8b86b;hb=HEAD;hp=c24063f9a3c67a6ea7f0ac85537078e5a9bf333e;hpb=560cbe9cf273873ce4f7a78e10585c72682fc477;p=packages%2Fmysql.git diff --git a/mysql-opt.patch b/mysql-opt.patch deleted file mode 100644 index c24063f..0000000 --- a/mysql-opt.patch +++ /dev/null @@ -1,62 +0,0 @@ -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 ---- percona-server-5.7.28-31.orig/cmake/build_configurations/compiler_options.cmake 2019-12-16 22:33:24.884000000 +0100 -+++ percona-server-5.7.28-31/cmake/build_configurations/compiler_options.cmake 2019-12-16 22:34:14.208000000 +0100 -@@ -32,17 +32,17 @@ - SET(64BIT 1) - ENDIF() - --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() - -@@ -68,8 +68,8 @@ - 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 -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") -@@ -102,8 +102,8 @@ - # 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 @@ - - 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()