diff options
Diffstat (limited to 'databases/mysql56-client')
| -rw-r--r-- | databases/mysql56-client/Makefile | 1 | ||||
| -rw-r--r-- | databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake | 14 |
2 files changed, 7 insertions, 8 deletions
diff --git a/databases/mysql56-client/Makefile b/databases/mysql56-client/Makefile index ffe50772b27e..2709982aa04f 100644 --- a/databases/mysql56-client/Makefile +++ b/databases/mysql56-client/Makefile @@ -31,6 +31,5 @@ MMAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mys mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 CLIENT_ONLY= yes -EXTRA_PATCHES+= ${MASTERDIR}/files/patch-PR225888.diff .include "${MASTERDIR}/Makefile" diff --git a/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake b/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake index 04ebb7111456..f22178ade70a 100644 --- a/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake +++ b/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake @@ -1,6 +1,6 @@ ---- cmake/build_configurations/compiler_options.cmake.orig 2016-03-03 16:35:33.000000000 +0100 -+++ cmake/build_configurations/compiler_options.cmake 2016-04-19 17:30:13.345558666 +0200 -@@ -25,7 +25,7 @@ IF(UNIX) +--- cmake/build_configurations/compiler_options.cmake.orig 2020-01-01 21:24:49.736077000 +0100 ++++ cmake/build_configurations/compiler_options.cmake 2020-01-01 21:25:22.307418000 +0100 +@@ -32,7 +32,7 @@ IF(UNIX) # Default GCC flags IF(CMAKE_COMPILER_IS_GNUCC) @@ -9,10 +9,10 @@ # Disable inline optimizations for valgrind testing to avoid false positives IF(WITH_VALGRIND) SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}") -@@ -34,7 +34,7 @@ IF(UNIX) - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") - ENDIF() - IF(CMAKE_COMPILER_IS_GNUCXX) +@@ -47,7 +47,7 @@ IF(UNIX) + IF(GXX_VERSION VERSION_EQUAL 6.0 OR GXX_VERSION VERSION_GREATER 6.0) + SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=gnu++03") + ENDIF() - SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") + SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") # Disable inline optimizations for valgrind testing to avoid false positives |