- fix building with OpenSSL 3.0, no R(triggerpostun) in rpm.org

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

diff --git a/mysql-cmake.patch b/mysql-cmake.patch
index 7b7ae1c2100e24e5d81f3a164bf7ed8f352c8c60..b26722a8b40411d25fe66910200f6c613150e75e 100644 (file)
--- a/mysql-cmake.patch
+++ b/mysql-cmake.patch
@@ -1,6 +1,7 @@
---- Percona-Server-5.6.15-rel63.0/cmake/readline.cmake.orig    2013-12-18 10:52:13.000000000 +0100
-+++ Percona-Server-5.6.15-rel63.0/cmake/readline.cmake 2014-02-09 06:17:56.079619159 +0100
-@@ -131,23 +131,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
@@ -28,8 +29,8 @@
    )
    MARK_AS_ADVANCED(EDITLINE_INCLUDE_DIR EDITLINE_LIBRARY)
  
-@@ -160,7 +160,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>
@@ -37,7 +38,7 @@
      int main(int argc, char **argv)
      {
         HIST_ENTRY entry;
-@@ -170,14 +170,13 @@
+@@ -151,14 +151,13 @@
  
      CHECK_CXX_SOURCE_COMPILES("
      #include <stdio.h>
@@ -55,5 +56,5 @@
 +      rl_completion_matches(0,0);
 +      return res ? 0 : 1;
      }"
-     EDITLINE_HAVE_COMPLETION)
+     XLINE_HAVE_COMPLETION_INT)