summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@tuffmail.com>2014-08-11 18:47:07 -0400
committerBrian Evans <grknight@tuffmail.com>2014-08-11 18:47:07 -0400
commitfa1d8943e262c1f47feed3b30553e92a4cf82ed5 (patch)
tree3b3d5a9296c1db0c0a509d6edd714c69161901a8 /20001_all_fix-minimal-build-cmake-mariadb-10.0.13.patch
parentRespin minimal patches for new MySQL versions (diff)
downloadmysql-extras-fa1d8943e262c1f47feed3b30553e92a4cf82ed5.tar.gz
mysql-extras-fa1d8943e262c1f47feed3b30553e92a4cf82ed5.tar.bz2
mysql-extras-fa1d8943e262c1f47feed3b30553e92a4cf82ed5.zip
Fix minimal builds on MariaDB 10.0.13mysql-extras-20140811-2248Z
Diffstat (limited to '20001_all_fix-minimal-build-cmake-mariadb-10.0.13.patch')
-rw-r--r--20001_all_fix-minimal-build-cmake-mariadb-10.0.13.patch16
1 files changed, 16 insertions, 0 deletions
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)
+