diff options
Diffstat (limited to 'databases/mysql84-server/files/patch-CMakeLists.txt')
| -rw-r--r-- | databases/mysql84-server/files/patch-CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/databases/mysql84-server/files/patch-CMakeLists.txt b/databases/mysql84-server/files/patch-CMakeLists.txt index 8ad23c61d72f..8994243f163f 100644 --- a/databases/mysql84-server/files/patch-CMakeLists.txt +++ b/databases/mysql84-server/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2024-04-10 06:26:28 UTC +--- CMakeLists.txt.orig 2024-06-03 11:39:00 UTC +++ CMakeLists.txt -@@ -1836,7 +1836,7 @@ IF(WITH_AUTHENTICATION_LDAP) +@@ -1845,7 +1845,7 @@ IF(WITH_AUTHENTICATION_LDAP) ENDIF() IF(WITH_AUTHENTICATION_LDAP) @@ -9,7 +9,7 @@ # LDAP / SASL / KERBEROS / SSL must all be "system" or "custom", not a mix. IF(WITH_LDAP STREQUAL "system" OR WITH_SASL STREQUAL "system" OR -@@ -1887,6 +1887,7 @@ ENDIF() +@@ -1896,6 +1896,7 @@ ENDIF() ENDIF() ENDIF() @@ -17,7 +17,7 @@ # Add system/bundled editline. MYSQL_CHECK_EDITLINE() SET(EDITLINE_WARN_GIVEN) -@@ -1897,6 +1898,7 @@ ENDIF() +@@ -1906,6 +1907,7 @@ ENDIF() "You can use -DWITH_EDITLINE=bundled instead." ) ENDIF() @@ -36,7 +36,7 @@ ADD_SUBDIRECTORY(strings) ADD_SUBDIRECTORY(vio) ADD_SUBDIRECTORY(mysys) -@@ -2235,12 +2239,15 @@ ENDIF() +@@ -2239,12 +2243,15 @@ ENDIF() ADD_SUBDIRECTORY(unittest/mytap/t) ENDIF() @@ -54,7 +54,7 @@ ADD_SUBDIRECTORY(testclients) ADD_SUBDIRECTORY(sql) ENDIF() -@@ -2318,11 +2325,11 @@ ADD_SUBDIRECTORY(scripts) +@@ -2322,11 +2329,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) @@ -67,7 +67,7 @@ IF(WITH_INTERNAL) ADD_SUBDIRECTORY(internal) ENDIF() -@@ -2350,8 +2357,10 @@ ENDIF() +@@ -2354,8 +2361,10 @@ ENDIF() INCLUDE(fastcov) ENDIF() |