diff -urNpa mysql-8.4.0.orig/cmake/readline.cmake mysql-8.4.0/cmake/readline.cmake
--- mysql-8.4.0.orig/cmake/readline.cmake	2024-05-09 15:03:55.909198871 +0200
+++ mysql-8.4.0/cmake/readline.cmake	2024-05-09 15:04:09.737390835 +0200
@@ -130,23 +130,23 @@ ENDMACRO()
 
 MACRO (FIND_SYSTEM_EDITLINE)
   FIND_PATH(FOUND_EDITLINE_READLINE
-    NAMES editline/readline.h
+    NAMES readline/readline.h
   )
   IF(FOUND_EDITLINE_READLINE)
-    SET(EDITLINE_INCLUDE_DIR "${FOUND_EDITLINE_READLINE}/editline")
+    SET(EDITLINE_INCLUDE_DIR "${FOUND_EDITLINE_READLINE}/readline")
   ELSE()
     # Different path on FreeBSD
     FIND_PATH(FOUND_EDIT_READLINE_READLINE
       NAMES edit/readline/readline.h
     )
     IF(FOUND_EDIT_READLINE_READLINE)
-      SET(EDITLINE_INCLUDE_DIR "${FOUND_EDIT_READLINE_READLINE}/edit/readline")
+      SET(EDITLINE_INCLUDE_DIR "${FOUND_EDIT_READLINE_READLINE}/readline")
     ENDIF()
   ENDIF()
 
   FIND_LIBRARY(EDITLINE_LIBRARY
     NAMES
-    edit
+    readline
   )
   MARK_AS_ADVANCED(EDITLINE_INCLUDE_DIR EDITLINE_LIBRARY)
 
@@ -162,7 +162,7 @@ MACRO (FIND_SYSTEM_EDITLINE)
     LIST(APPEND CMAKE_REQUIRED_LIBRARIES ${EDITLINE_LIBRARY})
     CHECK_CXX_SOURCE_COMPILES("
     #include <stdio.h>
-    #include <readline.h>
+    #include <readline/history.h>
     int main(int argc, char **argv)
     {
        HIST_ENTRY entry;
@@ -172,14 +172,13 @@ MACRO (FIND_SYSTEM_EDITLINE)
 
     CHECK_CXX_SOURCE_COMPILES("
     #include <stdio.h>
-    #include <readline.h>
+    #include <readline/readline.h>
     int main(int argc, char **argv)
     {
-      typedef int MYFunction(const char*, int);
-      MYFunction* myf= rl_completion_entry_function;
-      int res= (myf)(NULL, 0);
-      completion_matches(0,0);
-      return res;
+      rl_compentry_func_t *myf= rl_completion_entry_function;
+      char *res= (myf)(NULL, 0);
+      rl_completion_matches(0,0);
+      return res ? 0 : 1;
     }"
     EDITLINE_HAVE_COMPLETION_INT)
 
@@ -191,7 +190,7 @@ MACRO (FIND_SYSTEM_EDITLINE)
       typedef char* MYFunction(const char*, int);
       MYFunction* myf= rl_completion_entry_function;
       char *res= (myf)(NULL, 0);
-      completion_matches(0,0);
+      rl_completion_matches(0,0);
       return res != NULL;
     }"
     EDITLINE_HAVE_COMPLETION_CHAR)
diff -urNpa mysql-8.4.0.orig/CMakeLists.txt mysql-8.4.0/CMakeLists.txt
--- mysql-8.4.0.orig/CMakeLists.txt	2024-05-09 15:03:55.901198760 +0200
+++ mysql-8.4.0/CMakeLists.txt	2024-05-09 15:04:09.737390835 +0200
@@ -21,6 +21,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+variable_watch(CMAKE_EXECUTABLE_SUFFIX)
+
 MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
 
 IF(WIN32)