summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@lavabit.com>2013-01-18 22:00:00 -0500
committerBrian Evans <grknight@lavabit.com>2013-01-18 22:00:00 -0500
commit8f0a7d31fef23582d4f3000d649d84ecba76ec9d (patch)
tree5ba5a76e9d0627ee79bcc6d01abd96fbfffd5ced /20001_all_fix-minimal-build-cmake-mysql-5.5.29.patch
parentSet maximum version on 20001_all_fix-minimal-build-cmake-mariadb.patch which ... (diff)
downloadmysql-extras-8f0a7d31fef23582d4f3000d649d84ecba76ec9d.tar.gz
mysql-extras-8f0a7d31fef23582d4f3000d649d84ecba76ec9d.tar.bz2
mysql-extras-8f0a7d31fef23582d4f3000d649d84ecba76ec9d.zip
Respin minimal patch for 5.5.29mysql-extras-20130120-0100Z
Diffstat (limited to '20001_all_fix-minimal-build-cmake-mysql-5.5.29.patch')
-rw-r--r--20001_all_fix-minimal-build-cmake-mysql-5.5.29.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/20001_all_fix-minimal-build-cmake-mysql-5.5.29.patch b/20001_all_fix-minimal-build-cmake-mysql-5.5.29.patch
new file mode 100644
index 0000000..8c63678
--- /dev/null
+++ b/20001_all_fix-minimal-build-cmake-mysql-5.5.29.patch
@@ -0,0 +1,49 @@
+--- CMakeLists.orig.txt 2013-01-18 16:58:34.701624830 -0500
++++ CMakeLists.txt 2013-01-18 17:00:51.479636903 -0500
+@@ -294,7 +294,11 @@
+ ADD_SUBDIRECTORY(regex)
+ ADD_SUBDIRECTORY(mysys)
+ ADD_SUBDIRECTORY(libmysql)
+-
++ADD_SUBDIRECTORY(client)
++ADD_SUBDIRECTORY(libservices)
++ADD_SUBDIRECTORY(scripts)
++ADD_SUBDIRECTORY(sql/share)
++ADD_SUBDIRECTORY(support-files)
+
+ IF(WITH_UNIT_TESTS)
+ ENABLE_TESTING()
+@@ -307,10 +311,7 @@
+ ADD_SUBDIRECTORY(extra)
+ IF(NOT WITHOUT_SERVER)
+ ADD_SUBDIRECTORY(tests)
+- ADD_SUBDIRECTORY(client)
+ ADD_SUBDIRECTORY(sql)
+- ADD_SUBDIRECTORY(sql/share)
+- ADD_SUBDIRECTORY(libservices)
+ OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
+ IF(WITH_EMBEDDED_SERVER)
+ ADD_SUBDIRECTORY(libmysqld)
+@@ -319,18 +320,17 @@
+
+ ADD_SUBDIRECTORY(mysql-test)
+ ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
+- ADD_SUBDIRECTORY(support-files)
+- ADD_SUBDIRECTORY(scripts)
+ ADD_SUBDIRECTORY(sql-bench)
+- IF(UNIX)
+- ADD_SUBDIRECTORY(man)
+- ENDIF()
+ IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
+ ADD_SUBDIRECTORY(internal)
+ ENDIF()
+ ADD_SUBDIRECTORY(packaging/rpm-uln)
+ ENDIF()
+
++IF(UNIX)
++ ADD_SUBDIRECTORY(man)
++ENDIF()
++
+ INCLUDE(cmake/abi_check.cmake)
+ INCLUDE(cmake/tags.cmake)
+