summaryrefslogtreecommitdiff
path: root/databases/mysql55-client/files/patch-CMakeLists.txt
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2010-12-27 15:02:38 +0000
committerAlex Dupre <ale@FreeBSD.org>2010-12-27 15:02:38 +0000
commitd9029c513982bd669b22c88b2f04cd4cfd5c201f (patch)
tree7f5fb76f05a3aae44742dda07753ffe091a58bfd /databases/mysql55-client/files/patch-CMakeLists.txt
parent- Update to 0.062 (diff)
Update MySQL to 5.5.8 GA release. Read UPDATING.
Major changes: - new installation layout, resembling RPM packages: - client = Client Utilities + Development Libraries + Shared components - server = MySQL Server + Embedded - new build system: cmake instead of autotools - fewer port knobs Expect various breakages, but if we are lucky this could become the new default mysql port.
Notes
Notes: svn path=/head/; revision=266994
Diffstat (limited to 'databases/mysql55-client/files/patch-CMakeLists.txt')
-rw-r--r--databases/mysql55-client/files/patch-CMakeLists.txt53
1 files changed, 53 insertions, 0 deletions
diff --git a/databases/mysql55-client/files/patch-CMakeLists.txt b/databases/mysql55-client/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..934244b14ec5
--- /dev/null
+++ b/databases/mysql55-client/files/patch-CMakeLists.txt
@@ -0,0 +1,53 @@
+--- CMakeLists.txt.orig 2010-12-03 18:58:24.000000000 +0100
++++ CMakeLists.txt 2010-12-23 17:01:52.000000000 +0100
+@@ -292,27 +292,11 @@
+ ENDIF()
+
+ 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)
+- ADD_SUBDIRECTORY(libmysqld/examples)
+- ENDIF(WITH_EMBEDDED_SERVER)
+-
+- 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()
+-ENDIF()
++ADD_SUBDIRECTORY(client)
++ADD_SUBDIRECTORY(libservices)
++ADD_SUBDIRECTORY(support-files)
++ADD_SUBDIRECTORY(scripts)
++ADD_SUBDIRECTORY(man)
+
+ INCLUDE(cmake/abi_check.cmake)
+ INCLUDE(cmake/tags.cmake)
+@@ -338,11 +322,11 @@
+
+ INCLUDE(CPack)
+ IF(UNIX)
+- INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
+ ENDIF()
+ #
+ # RPM installs documentation directly from the source tree
+ #
++IF(FALSE)
+ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+ INSTALL(FILES COPYING LICENSE.mysql
+ DESTINATION ${INSTALL_DOCREADMEDIR}
+@@ -367,3 +351,4 @@
+ PATTERN "sp-imp-spec.txt" EXCLUDE
+ )
+ ENDIF()
++ENDIF()