1 diff -ruN mysql-5.7.21.orig/cmake/readline.cmake mysql-5.7.21/cmake/readline.cmake
2 --- mysql-5.7.21.orig/cmake/readline.cmake 2017-12-28 04:46:26.000000000 +0100
3 +++ mysql-5.7.21/cmake/readline.cmake 2018-03-31 21:17:28.373826351 +0200
4 @@ -110,23 +110,23 @@ ENDMACRO()
6 MACRO (FIND_SYSTEM_EDITLINE)
7 FIND_PATH(FOUND_EDITLINE_READLINE
8 - NAMES editline/readline.h
9 + NAMES readline/readline.h
11 IF(FOUND_EDITLINE_READLINE)
12 - SET(EDITLINE_INCLUDE_DIR "${FOUND_EDITLINE_READLINE}/editline")
13 + SET(EDITLINE_INCLUDE_DIR "${FOUND_EDITLINE_READLINE}/readline")
15 # Different path on FreeBSD
16 FIND_PATH(FOUND_EDIT_READLINE_READLINE
17 NAMES edit/readline/readline.h
19 IF(FOUND_EDIT_READLINE_READLINE)
20 - SET(EDITLINE_INCLUDE_DIR "${FOUND_EDIT_READLINE_READLINE}/edit/readline")
21 + SET(EDITLINE_INCLUDE_DIR "${FOUND_EDIT_READLINE_READLINE}/readline")
25 FIND_LIBRARY(EDITLINE_LIBRARY
30 MARK_AS_ADVANCED(EDITLINE_INCLUDE_DIR EDITLINE_LIBRARY)
32 @@ -139,7 +139,7 @@ MACRO (FIND_SYSTEM_EDITLINE)
33 LIST(APPEND CMAKE_REQUIRED_LIBRARIES ${EDITLINE_LIBRARY})
34 CHECK_CXX_SOURCE_COMPILES("
36 - #include <readline.h>
37 + #include <readline/history.h>
38 int main(int argc, char **argv)
41 @@ -149,14 +149,13 @@ MACRO (FIND_SYSTEM_EDITLINE)
43 CHECK_CXX_SOURCE_COMPILES("
45 - #include <readline.h>
46 + #include <readline/readline.h>
47 int main(int argc, char **argv)
49 - typedef int MYFunction(const char*, int);
50 - MYFunction* myf= rl_completion_entry_function;
51 - int res= (myf)(NULL, 0);
52 - completion_matches(0,0);
54 + rl_compentry_func_t *myf= rl_completion_entry_function;
55 + char *res= (myf)(NULL, 0);
56 + rl_completion_matches(0,0);
59 EDITLINE_HAVE_COMPLETION_INT)
61 @@ -168,7 +167,7 @@ MACRO (FIND_SYSTEM_EDITLINE)
62 typedef char* MYFunction(const char*, int);
63 MYFunction* myf= rl_completion_entry_function;
64 char *res= (myf)(NULL, 0);
65 - completion_matches(0,0);
66 + rl_completion_matches(0,0);
69 EDITLINE_HAVE_COMPLETION_CHAR)
70 --- mysql-8.1.0/CMakeLists.txt~ 2023-06-21 09:52:10.000000000 +0200
71 +++ mysql-8.1.0/CMakeLists.txt 2023-10-20 10:08:46.673284042 +0200
73 # along with this program; if not, write to the Free Software
74 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
76 +variable_watch(CMAKE_EXECUTABLE_SUFFIX)
78 MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")