summaryrefslogtreecommitdiff
path: root/databases/mysql81-server/files/patch-CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'databases/mysql81-server/files/patch-CMakeLists.txt')
-rw-r--r--databases/mysql81-server/files/patch-CMakeLists.txt95
1 files changed, 0 insertions, 95 deletions
diff --git a/databases/mysql81-server/files/patch-CMakeLists.txt b/databases/mysql81-server/files/patch-CMakeLists.txt
deleted file mode 100644
index a7c3d317d734..000000000000
--- a/databases/mysql81-server/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,95 +0,0 @@
---- CMakeLists.txt.orig 2023-06-21 07:52:10 UTC
-+++ CMakeLists.txt
-@@ -1850,7 +1850,7 @@ IF(WITH_AUTHENTICATION_LDAP)
- ENDIF()
-
- IF(WITH_AUTHENTICATION_LDAP)
-- IF(LINUX AND KNOWN_CUSTOM_LIBRARIES)
-+ IF(LINUX OR FREEBSD AND KNOWN_CUSTOM_LIBRARIES)
- # LDAP / SASL / KERBEROS / SSL must all be "system" or "custom", not a mix.
- IF(WITH_LDAP STREQUAL "system" OR
- WITH_SASL STREQUAL "system" OR
-@@ -1899,6 +1899,7 @@ ENDIF()
- ENDIF()
- ENDIF()
-
-+IF(NOT WITHOUT_TOOLS)
- # Add system/bundled editline.
- MYSQL_CHECK_EDITLINE()
- SET(EDITLINE_WARN_GIVEN)
-@@ -1909,7 +1910,9 @@ ENDIF()
- "You can use -DWITH_EDITLINE=bundled instead."
- )
- ENDIF()
-+ENDIF(NOT WITHOUT_TOOLS)
-
-+IF(NOT WITHOUT_SERVER)
- # Add libevent
- MYSQL_CHECK_LIBEVENT()
- UNSET(LIBEVENT_WARN_GIVEN)
-@@ -1920,6 +1923,7 @@ ENDIF()
- "You can use -DWITH_LIBEVENT=bundled instead."
- )
- ENDIF()
-+ENDIF(NOT WITHOUT_SERVER)
-
- # Add lz4 library
- MYSQL_CHECK_LZ4()
-@@ -2186,7 +2190,9 @@ ADD_DEPENDENCIES(clang_tidy_prerequisites GenError)
- ADD_DEPENDENCIES(clang_tidy_prerequisites protobuf_generated_all)
- ADD_DEPENDENCIES(clang_tidy_prerequisites GenError)
-
--ADD_SUBDIRECTORY(include)
-+IF(NOT WITHOUT_CLIENTLIBS)
-+ ADD_SUBDIRECTORY(include)
-+ENDIF(NOT WITHOUT_CLIENTLIBS)
- ADD_SUBDIRECTORY(strings)
- ADD_SUBDIRECTORY(vio)
- ADD_SUBDIRECTORY(mysys)
-@@ -2232,12 +2238,15 @@ ENDIF()
- ADD_SUBDIRECTORY(unittest/mytap/t)
- ENDIF()
-
--ADD_SUBDIRECTORY(client)
-+IF(NOT WITHOUT_TOOLS)
-+ ADD_SUBDIRECTORY(client)
-+ENDIF(NOT WITHOUT_TOOLS)
-+
- ADD_SUBDIRECTORY(utilities)
--ADD_SUBDIRECTORY(share)
- ADD_SUBDIRECTORY(libservices)
-
- IF(NOT WITHOUT_SERVER)
-+ ADD_SUBDIRECTORY(share)
- ADD_SUBDIRECTORY(testclients)
- ADD_SUBDIRECTORY(sql)
- ENDIF()
-@@ -2300,11 +2309,11 @@ ADD_SUBDIRECTORY(scripts)
- # scripts/mysql_config depends on client and server targets loaded above.
- # It is referenced by some of the directories below, so we insert it here.
- ADD_SUBDIRECTORY(scripts)
-+ADD_SUBDIRECTORY(support-files)
-
- IF(NOT WITHOUT_SERVER)
- ADD_SUBDIRECTORY(mysql-test)
- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
-- ADD_SUBDIRECTORY(support-files)
- IF(WITH_INTERNAL)
- ADD_SUBDIRECTORY(internal)
- ENDIF()
-@@ -2331,6 +2340,7 @@ ENDIF()
- INCLUDE(fastcov)
- ENDIF()
-
-+IF(FALSE)
- IF(UNIX)
- ADD_SUBDIRECTORY(man)
- ENDIF()
-@@ -2530,6 +2540,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
- PATTERN "sp-imp-spec.txt" EXCLUDE
- PATTERN "README.build" EXCLUDE
- )
-+ENDIF()
- ENDIF()
-
- # Now that we're done with all ADD_SUBDIRECTORY and thus all feature tests,