| 1 |
commit: ccf74a2d22ed7ef2f5628329c45aa1dd4724218b |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 3 19:03:50 2014 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 3 19:03:50 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=ccf74a2d |
| 7 |
|
| 8 |
Respin minimal patch for mysql-5.5.41 |
| 9 |
|
| 10 |
--- |
| 11 |
00000_index.txt | 8 +++- |
| 12 |
..._all_fix-minimal-build-cmake-mysql-5.5.41.patch | 50 ++++++++++++++++++++++ |
| 13 |
2 files changed, 57 insertions(+), 1 deletion(-) |
| 14 |
|
| 15 |
diff --git a/00000_index.txt b/00000_index.txt |
| 16 |
index ccf19c0..e4103c2 100644 |
| 17 |
--- a/00000_index.txt |
| 18 |
+++ b/00000_index.txt |
| 19 |
@@ -1500,7 +1500,13 @@ |
| 20 |
@@ Fix the minimal build by reordering CMakeLists.txt |
| 21 |
|
| 22 |
@patch 20001_all_fix-minimal-build-cmake-mysql-5.5.39.patch |
| 23 |
-@ver 5.05.39.00 to 5.05.99.99 |
| 24 |
+@ver 5.05.39.00 to 5.05.40.99 |
| 25 |
+@pn mysql |
| 26 |
+@pn percona-server |
| 27 |
+@@ Fix the minimal build by reordering CMakeLists.txt |
| 28 |
+ |
| 29 |
+@patch 20001_all_fix-minimal-build-cmake-mysql-5.5.41.patch |
| 30 |
+@ver 5.05.41.00 to 5.05.99.99 |
| 31 |
@pn mysql |
| 32 |
@pn percona-server |
| 33 |
@@ Fix the minimal build by reordering CMakeLists.txt |
| 34 |
|
| 35 |
diff --git a/20001_all_fix-minimal-build-cmake-mysql-5.5.41.patch b/20001_all_fix-minimal-build-cmake-mysql-5.5.41.patch |
| 36 |
new file mode 100644 |
| 37 |
index 0000000..d069732 |
| 38 |
--- /dev/null |
| 39 |
+++ b/20001_all_fix-minimal-build-cmake-mysql-5.5.41.patch |
| 40 |
@@ -0,0 +1,50 @@ |
| 41 |
+diff -aurN mysql.orig/CMakeLists.txt mysql/CMakeLists.txt |
| 42 |
+--- mysql.orig/CMakeLists.txt 2014-11-04 02:49:52.000000000 -0500 |
| 43 |
++++ mysql/CMakeLists.txt 2014-12-03 13:46:18.534238953 -0500 |
| 44 |
+@@ -376,6 +376,11 @@ |
| 45 |
+ ADD_SUBDIRECTORY(regex) |
| 46 |
+ ADD_SUBDIRECTORY(mysys) |
| 47 |
+ ADD_SUBDIRECTORY(libmysql) |
| 48 |
++ADD_SUBDIRECTORY(client) |
| 49 |
++ADD_SUBDIRECTORY(libservices) |
| 50 |
++ADD_SUBDIRECTORY(scripts) |
| 51 |
++ADD_SUBDIRECTORY(sql/share) |
| 52 |
++ADD_SUBDIRECTORY(support-files) |
| 53 |
+ |
| 54 |
+ IF(WITH_UNIT_TESTS) |
| 55 |
+ ENABLE_TESTING() |
| 56 |
+@@ -389,10 +394,7 @@ |
| 57 |
+ ADD_SUBDIRECTORY(extra) |
| 58 |
+ IF(NOT WITHOUT_SERVER) |
| 59 |
+ ADD_SUBDIRECTORY(tests) |
| 60 |
+- ADD_SUBDIRECTORY(client) |
| 61 |
+ ADD_SUBDIRECTORY(sql) |
| 62 |
+- ADD_SUBDIRECTORY(sql/share) |
| 63 |
+- ADD_SUBDIRECTORY(libservices) |
| 64 |
+ OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) |
| 65 |
+ IF(WITH_EMBEDDED_SERVER) |
| 66 |
+ ADD_SUBDIRECTORY(libmysqld) |
| 67 |
+@@ -401,12 +403,7 @@ |
| 68 |
+ |
| 69 |
+ ADD_SUBDIRECTORY(mysql-test) |
| 70 |
+ ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) |
| 71 |
+- ADD_SUBDIRECTORY(support-files) |
| 72 |
+- ADD_SUBDIRECTORY(scripts) |
| 73 |
+ ADD_SUBDIRECTORY(sql-bench) |
| 74 |
+- IF(UNIX) |
| 75 |
+- ADD_SUBDIRECTORY(man) |
| 76 |
+- ENDIF() |
| 77 |
+ IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) |
| 78 |
+ ADD_SUBDIRECTORY(internal) |
| 79 |
+ ENDIF() |
| 80 |
+@@ -414,6 +411,10 @@ |
| 81 |
+ ADD_SUBDIRECTORY(packaging/rpm-sles) |
| 82 |
+ ENDIF() |
| 83 |
+ |
| 84 |
++IF(UNIX) |
| 85 |
++ ADD_SUBDIRECTORY(man) |
| 86 |
++ENDIF() |
| 87 |
++ |
| 88 |
+ INCLUDE(cmake/abi_check.cmake) |
| 89 |
+ INCLUDE(cmake/tags.cmake) |
| 90 |
+ |
Archives