diff options
| author | Thomas Zander <riggs@FreeBSD.org> | 2016-09-16 15:55:15 +0000 |
|---|---|---|
| committer | Thomas Zander <riggs@FreeBSD.org> | 2016-09-16 15:55:15 +0000 |
| commit | b5931dac78825dcc54e0f064235c48daba2739a8 (patch) | |
| tree | 922eb88768d479dc3eeeb513621a3854cd2542ca /databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake | |
| parent | security/libp11: Mark IGNORE if SSL_DEFAULT matchs libressl (diff) | |
Update to upstream version 5.7.15; fixes zero-day remote vuln CVE-2016-6662
PR: 212690
Submitted by: mokhi64@gmail.com (maintainer)
MFH: 2016Q3
Security: CVE 2016-6662
Diffstat (limited to 'databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake')
| -rw-r--r-- | databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake b/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake index 2fcf5754c44e..713c197992bc 100644 --- a/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake +++ b/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake @@ -1,6 +1,6 @@ ---- cmake/build_configurations/compiler_options.cmake.orig 2016-03-28 18:06:12 UTC +--- cmake/build_configurations/compiler_options.cmake.orig 2016-08-25 11:52:06 UTC +++ cmake/build_configurations/compiler_options.cmake -@@ -28,7 +28,7 @@ IF(UNIX) +@@ -29,7 +29,7 @@ IF(UNIX) # Default GCC flags IF(CMAKE_COMPILER_IS_GNUCC) @@ -9,12 +9,12 @@ # Disable inline optimizations for valgrind testing to avoid false positives IF(WITH_VALGRIND) SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}") -@@ -37,7 +37,7 @@ IF(UNIX) +@@ -42,7 +42,7 @@ IF(UNIX) SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") ENDIF() IF(CMAKE_COMPILER_IS_GNUCXX) - 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 - IF(WITH_VALGRIND) - SET(COMMON_CXX_FLAGS "-fno-inline ${COMMON_CXX_FLAGS}") + # GCC 6 has C++14 as default, set it explicitly to the old default. + EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion + OUTPUT_VARIABLE GXX_VERSION) |