Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mysql-extras:master commit in: /
Date: Wed, 03 Dec 2014 18:22:24
Message-Id: 1417630933.7d7d290a70003c4e366c04b4c9268fb678317a92.grknight@gentoo
1 commit: 7d7d290a70003c4e366c04b4c9268fb678317a92
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 3 18:22:13 2014 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 3 18:22:13 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=7d7d290a
7
8 Respin Werror patch for dev-db/mysql-5.6.22
9
10 ---
11 00000_index.txt | 8 +++++++-
12 20007_all_cmake-debug-werror-5.6.22.patch | 17 +++++++++++++++++
13 2 files changed, 24 insertions(+), 1 deletion(-)
14
15 diff --git a/00000_index.txt b/00000_index.txt
16 index d66dffa..ccf19c0 100644
17 --- a/00000_index.txt
18 +++ b/00000_index.txt
19 @@ -1714,7 +1714,13 @@
20 @@ Remove -Werror from USE="debug" builds
21
22 @patch 20007_all_cmake-debug-werror-5.6.16.patch
23 -@ver 5.06.16.00 to 5.06.99.99
24 +@ver 5.06.16.00 to 5.06.21.99
25 +@pn mysql
26 +@pn percona-server
27 +@@ Remove -Werror from USE="debug" builds
28 +
29 +@patch 20007_all_cmake-debug-werror-5.6.22.patch
30 +@ver 5.06.22.00 to 5.06.99.99
31 @pn mysql
32 @pn percona-server
33 @@ Remove -Werror from USE="debug" builds
34
35 diff --git a/20007_all_cmake-debug-werror-5.6.22.patch b/20007_all_cmake-debug-werror-5.6.22.patch
36 new file mode 100644
37 index 0000000..80613ea
38 --- /dev/null
39 +++ b/20007_all_cmake-debug-werror-5.6.22.patch
40 @@ -0,0 +1,17 @@
41 +diff -aurN a/cmake/maintainer.cmake b/cmake/maintainer.cmake
42 +--- a/cmake/maintainer.cmake 2014-11-21 00:39:51.000000000 -0500
43 ++++ b/cmake/maintainer.cmake 2014-12-03 13:19:50.893380789 -0500
44 +@@ -34,13 +34,6 @@
45 + "${MY_CXX_WARNING_FLAGS} -Wno-null-conversion -Wno-unused-private-field")
46 + ENDIF()
47 +
48 +-# Turn on Werror (warning => error) when using maintainer mode.
49 +-IF(MYSQL_MAINTAINER_MODE)
50 +- SET(MY_C_WARNING_FLAGS "${MY_C_WARNING_FLAGS} -Werror")
51 +- SET(MY_CXX_WARNING_FLAGS "${MY_CXX_WARNING_FLAGS} -Werror")
52 +- SET(COMPILE_FLAG_WERROR 1)
53 +-ENDIF()
54 +-
55 + # Set warning flags for GCC/Clang
56 + IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
57 + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_WARNING_FLAGS}")