commit: fa1d8943e262c1f47feed3b30553e92a4cf82ed5
Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Mon Aug 11 22:47:07 2014 +0000
Commit: Brian Evans <grknight <AT> tuffmail <DOT> com>
CommitDate: Mon Aug 11 22:47:07 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=fa1d8943
Fix minimal builds on MariaDB 10.0.13
---
00000_index.txt | 6 ++++++
20001_all_fix-minimal-build-cmake-mariadb-10.0.13.patch | 16 ++++++++++++++++
2 files changed, 22 insertions(+)
diff --git a/00000_index.txt b/00000_index.txt
index 7051194..c184471 100644
--- a/00000_index.txt
+++ b/00000_index.txt
@@ -1508,6 +1508,12 @@
@pn mariadb
@@ Fix the minimal build by reordering CMakeLists.txt
+@patch 20001_all_fix-minimal-build-cmake-mariadb-10.0.13.patch
+@ver 10.00.13.00 to 10.99.99.99
+@pn mariadb
+@@ Fix the minimal build by reordering CMakeLists.txt
+@@ Fixes MDEV-6562
+
@patch 21000_all_sql-5.1.62.patch
@ver 5.01.62.00 to 5.01.64.99
@pn mariadb
diff --git a/20001_all_fix-minimal-build-cmake-mariadb-10.0.13.patch
b/20001_all_fix-minimal-build-cmake-mariadb-10.0.13.patch
new file mode 100644
index 0000000..99a46fd
--- /dev/null
+++ b/20001_all_fix-minimal-build-cmake-mariadb-10.0.13.patch
@@ -0,0 +1,16 @@
+=== modified file 'CMakeLists.txt'
+--- a/CMakeLists.txt 2014-08-07 16:06:56 +0000
++++ b/CMakeLists.txt 2014-08-11 21:43:29 +0000
+@@ -466,7 +466,10 @@
+ ADD_SUBDIRECTORY(packaging/solaris)
+
+ IF(NOT CMAKE_CROSSCOMPILING)
+- SET(EXPORTED comp_err comp_sql factorial gen_lex_hash)
++ SET(EXPORTED comp_err comp_sql factorial)
++ IF(NOT WITHOUT_SERVER)
++ SET(EXPORTED ${EXPORTED} gen_lex_hash)
++ ENDIF()
+ # minimal target to build only binaries for export
+ ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED})
+ EXPORT(TARGETS ${EXPORTED} FILE
${CMAKE_BINARY_DIR}/import_executables.cmake)
+
