- updated to 5.7.35-38

[packages/mysql.git] / mysql-cmake.patch

diff --git a/mysql-cmake.patch b/mysql-cmake.patch
index 9d439ee5f1eacf5252da2e7f3428d2c762a88594..b26722a8b40411d25fe66910200f6c613150e75e 100644 (file)
--- a/mysql-cmake.patch
+++ b/mysql-cmake.patch
@@ -1,7 +1,7 @@
-diff -ur percona-server-5.7.28-31.orig/cmake/readline.cmake percona-server-5.7.28-31/cmake/readline.cmake
---- percona-server-5.7.28-31.orig/cmake/readline.cmake 2019-12-16 23:52:33.110000000 +0100
-+++ percona-server-5.7.28-31/cmake/readline.cmake      2019-12-16 23:53:01.681000000 +0100
-@@ -119,23 +119,23 @@
+diff -ur percona-server-5.7.35-38.orig/cmake/readline.cmake percona-server-5.7.35-38/cmake/readline.cmake
+--- percona-server-5.7.35-38.orig/cmake/readline.cmake 2021-11-24 19:49:56.851969940 +0100
++++ percona-server-5.7.35-38/cmake/readline.cmake      2021-11-24 19:50:52.286101293 +0100
+@@ -110,23 +110,23 @@
  
  MACRO (FIND_SYSTEM_EDITLINE)
    FIND_PATH(FOUND_EDITLINE_READLINE
@@ -29,8 +29,8 @@ diff -ur percona-server-5.7.28-31.orig/cmake/readline.cmake percona-server-5.7.2
    )
    MARK_AS_ADVANCED(EDITLINE_INCLUDE_DIR EDITLINE_LIBRARY)
  
-@@ -148,7 +148,7 @@
-     SET(CMAKE_REQUIRED_LIBRARIES ${EDITLINE_LIBRARY})
+@@ -141,7 +141,7 @@
+     LIST(APPEND CMAKE_REQUIRED_LIBRARIES ${EDITLINE_LIBRARY})
      CHECK_CXX_SOURCE_COMPILES("
      #include <stdio.h>
 -    #include <readline.h>
@@ -38,7 +38,7 @@ diff -ur percona-server-5.7.28-31.orig/cmake/readline.cmake percona-server-5.7.2
      int main(int argc, char **argv)
      {
         HIST_ENTRY entry;
-@@ -158,14 +158,13 @@
+@@ -151,14 +151,13 @@
  
      CHECK_CXX_SOURCE_COMPILES("
      #include <stdio.h>
@@ -56,5 +56,5 @@ diff -ur percona-server-5.7.28-31.orig/cmake/readline.cmake percona-server-5.7.2
 +      rl_completion_matches(0,0);
 +      return res ? 0 : 1;
      }"
-     EDITLINE_HAVE_COMPLETION_INT)
+     XLINE_HAVE_COMPLETION_INT)