diff options
Diffstat (limited to 'databases/mysql80-server/files/patch-CMakeLists.txt')
| -rw-r--r-- | databases/mysql80-server/files/patch-CMakeLists.txt | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/databases/mysql80-server/files/patch-CMakeLists.txt b/databases/mysql80-server/files/patch-CMakeLists.txt index 1838577bde1c..0b4f88bfd853 100644 --- a/databases/mysql80-server/files/patch-CMakeLists.txt +++ b/databases/mysql80-server/files/patch-CMakeLists.txt @@ -1,6 +1,15 @@ ---- CMakeLists.txt.orig 2020-09-23 12:37:48 UTC +--- CMakeLists.txt.orig 2021-09-28 11:46:34 UTC +++ CMakeLists.txt -@@ -1417,10 +1417,10 @@ IF(WITH_AUTHENTICATION_LDAP) +@@ -1647,7 +1647,7 @@ IF(LINUX AND KNOWN_CUSTOM_LIBRARIES) + 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 +@@ -1696,10 +1696,10 @@ IF(WITH_AUTHENTICATION_KERBEROS) ENDIF() ENDIF() @@ -14,9 +23,9 @@ # Add lz4 library MYSQL_CHECK_LZ4() # Add icu library -@@ -1520,7 +1520,9 @@ IF(WITH_UNIT_TESTS) - INCLUDE(googletest) - ENDIF() +@@ -1869,7 +1869,9 @@ OPTION(WITH_HYPERGRAPH_OPTIMIZER + ${WITH_HYPERGRAPH_OPTIMIZER_DEFAULT} + ) -ADD_SUBDIRECTORY(include) +IF(NOT WITHOUT_CLIENTLIBS) @@ -25,7 +34,7 @@ ADD_SUBDIRECTORY(strings) ADD_SUBDIRECTORY(vio) ADD_SUBDIRECTORY(mysys) -@@ -1562,12 +1564,17 @@ IF(WITH_UNIT_TESTS) +@@ -1913,12 +1915,17 @@ IF(WITH_UNIT_TESTS) ADD_SUBDIRECTORY(unittest/mytap/t) ENDIF() @@ -45,7 +54,7 @@ ADD_SUBDIRECTORY(testclients) ADD_SUBDIRECTORY(sql) ENDIF() -@@ -1590,11 +1597,11 @@ ENDIF() +@@ -1971,11 +1978,11 @@ ENDIF() # 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) @@ -58,7 +67,7 @@ IF(WITH_INTERNAL) ADD_SUBDIRECTORY(internal) ENDIF() -@@ -1703,6 +1710,7 @@ IF(PACK_SEPARATE_COMPONENTS) +@@ -2084,6 +2091,7 @@ IF(PACK_SEPARATE_COMPONENTS) SET(CPACK_COMPONENTS_GROUPING IGNORE) ENDIF() @@ -66,7 +75,7 @@ IF(UNIX) INSTALL(FILES Docs/mysql.info -@@ -1737,6 +1745,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") +@@ -2118,6 +2126,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "sp-imp-spec.txt" EXCLUDE PATTERN "README.build" EXCLUDE ) |