| 1 |
commit: 52ab5580cc39d07a9d3eecdce9b0e7f405db6459 |
| 2 |
Author: Brian Evans <grknight <AT> tuffmail <DOT> com> |
| 3 |
AuthorDate: Wed Feb 26 18:37:30 2014 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> lavabit <DOT> com> |
| 5 |
CommitDate: Wed Feb 26 18:37:30 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=52ab5580 |
| 7 |
|
| 8 |
Remove Werror from mysql and percona-server cmake |
| 9 |
|
| 10 |
--- |
| 11 |
00000_index.txt | 12 ++++++++++++ |
| 12 |
20007_all_cmake-debug-werror-5.6.patch | 18 ++++++++++++++++++ |
| 13 |
20007_all_cmake-debug-werror.patch | 15 +++++++++++++++ |
| 14 |
3 files changed, 45 insertions(+) |
| 15 |
|
| 16 |
diff --git a/00000_index.txt b/00000_index.txt |
| 17 |
index dd77021..719a590 100644 |
| 18 |
--- a/00000_index.txt |
| 19 |
+++ b/00000_index.txt |
| 20 |
@@ -1592,3 +1592,15 @@ |
| 21 |
@ver 10.00.07.00 to 10.00.99.99 |
| 22 |
@pn mariadb |
| 23 |
@@ Add ELIBPATH to split client and embedded libs |
| 24 |
+ |
| 25 |
+@patch 20007_all_cmake-debug-werror.patch |
| 26 |
+@ver 5.05.32.00 to 5.05.99.99 |
| 27 |
+@pn mysql |
| 28 |
+@pn percona-server |
| 29 |
+@@ Remove -Werror from USE="debug" builds |
| 30 |
+ |
| 31 |
+@patch 20007_all_cmake-debug-werror-5.6.patch |
| 32 |
+@ver 5.06.00.00 to 5.06.99.99 |
| 33 |
+@pn mysql |
| 34 |
+@pn percona-server |
| 35 |
+@@ Remove -Werror from USE="debug" builds |
| 36 |
|
| 37 |
diff --git a/20007_all_cmake-debug-werror-5.6.patch b/20007_all_cmake-debug-werror-5.6.patch |
| 38 |
new file mode 100644 |
| 39 |
index 0000000..be119f6 |
| 40 |
--- /dev/null |
| 41 |
+++ b/20007_all_cmake-debug-werror-5.6.patch |
| 42 |
@@ -0,0 +1,18 @@ |
| 43 |
+Gentoo-Bug: 494332 |
| 44 |
+Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=494332 |
| 45 |
+ |
| 46 |
+--- a/CMakeLists.txt 2014-02-26 13:32:49.779760325 -0500 |
| 47 |
++++ a/CMakeLists.txt 2014-02-26 13:33:27.208957243 -0500 |
| 48 |
+@@ -166,11 +166,7 @@ |
| 49 |
+ # Whether the maintainer mode compiler options should be enabled. |
| 50 |
+ IF(MYSQL_MAINTAINER_MODE) |
| 51 |
+ IF(CMAKE_C_COMPILER_ID MATCHES "GNU") |
| 52 |
+- IF(WITH_INNODB_MEMCACHED) |
| 53 |
+ SET_MYSQL_MAINTAINER_GNU_C_OPTIONS_NO_WERROR() |
| 54 |
+- ELSE() |
| 55 |
+- SET_MYSQL_MAINTAINER_GNU_C_OPTIONS() |
| 56 |
+- ENDIF() |
| 57 |
+ ENDIF() |
| 58 |
+ IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU") |
| 59 |
+ SET_MYSQL_MAINTAINER_GNU_CXX_OPTIONS() |
| 60 |
+ |
| 61 |
|
| 62 |
diff --git a/20007_all_cmake-debug-werror.patch b/20007_all_cmake-debug-werror.patch |
| 63 |
new file mode 100644 |
| 64 |
index 0000000..9f44808 |
| 65 |
--- /dev/null |
| 66 |
+++ b/20007_all_cmake-debug-werror.patch |
| 67 |
@@ -0,0 +1,15 @@ |
| 68 |
+Gentoo-Bug: 494332 |
| 69 |
+Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=494332 |
| 70 |
+ |
| 71 |
+--- a/cmake/maintainer.cmake |
| 72 |
++++ b/cmake/maintainer.cmake |
| 73 |
+@@ -18,7 +18,7 @@ |
| 74 |
+ # Setup GCC (GNU C compiler) warning options. |
| 75 |
+ MACRO(SET_MYSQL_MAINTAINER_GNU_C_OPTIONS) |
| 76 |
+ SET(MY_MAINTAINER_WARNINGS |
| 77 |
+- "-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing -Werror") |
| 78 |
++ "-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing") |
| 79 |
+ CHECK_C_COMPILER_FLAG("-Wdeclaration-after-statement" |
| 80 |
+ HAVE_DECLARATION_AFTER_STATEMENT) |
| 81 |
+ IF(HAVE_DECLARATION_AFTER_STATEMENT) |
| 82 |
+ |
Archives