diff options
| author |   Brian Evans <grknight@gentoo.org> | 2014-12-03 13:22:13 -0500 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2014-12-03 13:22:13 -0500 |
| commit | 7d7d290a70003c4e366c04b4c9268fb678317a92 (patch) | |
| tree | 6641db300b2fb17343b9c71af2be6f221892bfe7 | |
| parent | Respin patch for dev-db/mysql-5.6.22 (diff) | |
| download | mysql-extras-7d7d290a70003c4e366c04b4c9268fb678317a92.tar.gz mysql-extras-7d7d290a70003c4e366c04b4c9268fb678317a92.tar.bz2 mysql-extras-7d7d290a70003c4e366c04b4c9268fb678317a92.zip | |
Respin Werror patch for dev-db/mysql-5.6.22
| -rw-r--r-- | 00000_index.txt | 8 | ||||
| -rw-r--r-- | 20007_all_cmake-debug-werror-5.6.22.patch | 17 |
2 files changed, 24 insertions, 1 deletions
diff --git a/00000_index.txt b/00000_index.txt index d66dffa..ccf19c0 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -1714,7 +1714,13 @@ @@ Remove -Werror from USE="debug" builds @patch 20007_all_cmake-debug-werror-5.6.16.patch -@ver 5.06.16.00 to 5.06.99.99 +@ver 5.06.16.00 to 5.06.21.99 +@pn mysql +@pn percona-server +@@ Remove -Werror from USE="debug" builds + +@patch 20007_all_cmake-debug-werror-5.6.22.patch +@ver 5.06.22.00 to 5.06.99.99 @pn mysql @pn percona-server @@ Remove -Werror from USE="debug" builds diff --git a/20007_all_cmake-debug-werror-5.6.22.patch b/20007_all_cmake-debug-werror-5.6.22.patch new file mode 100644 index 0000000..80613ea --- /dev/null +++ b/20007_all_cmake-debug-werror-5.6.22.patch @@ -0,0 +1,17 @@ +diff -aurN a/cmake/maintainer.cmake b/cmake/maintainer.cmake +--- a/cmake/maintainer.cmake 2014-11-21 00:39:51.000000000 -0500 ++++ b/cmake/maintainer.cmake 2014-12-03 13:19:50.893380789 -0500 +@@ -34,13 +34,6 @@ + "${MY_CXX_WARNING_FLAGS} -Wno-null-conversion -Wno-unused-private-field") + ENDIF() + +-# Turn on Werror (warning => error) when using maintainer mode. +-IF(MYSQL_MAINTAINER_MODE) +- SET(MY_C_WARNING_FLAGS "${MY_C_WARNING_FLAGS} -Werror") +- SET(MY_CXX_WARNING_FLAGS "${MY_CXX_WARNING_FLAGS} -Werror") +- SET(COMPILE_FLAG_WERROR 1) +-ENDIF() +- + # Set warning flags for GCC/Clang + IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_WARNING_FLAGS}") |