- keep common dirs for mysqlrouter in mysql-common, fix /var/{lib,log} dirs

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

diff --git a/mysql-cmake.patch b/mysql-cmake.patch
index 9d439ee5f1eacf5252da2e7f3428d2c762a88594..b22b2f1f15baef0fc55e331ae05fe1fbe6814882 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 -ruN mysql-5.7.21.orig/cmake/readline.cmake mysql-5.7.21/cmake/readline.cmake
+--- mysql-5.7.21.orig/cmake/readline.cmake     2017-12-28 04:46:26.000000000 +0100
++++ mysql-5.7.21/cmake/readline.cmake  2018-03-31 21:17:28.373826351 +0200
+@@ -110,23 +110,23 @@ ENDMACRO()
  
  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})
+@@ -139,7 +139,7 @@ MACRO (FIND_SYSTEM_EDITLINE)
+     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 @@
+@@ -149,14 +149,13 @@ MACRO (FIND_SYSTEM_EDITLINE)
  
      CHECK_CXX_SOURCE_COMPILES("
      #include <stdio.h>
@@ -58,3 +58,23 @@ diff -ur percona-server-5.7.28-31.orig/cmake/readline.cmake percona-server-5.7.2
      }"
      EDITLINE_HAVE_COMPLETION_INT)
  
+@@ -168,7 +167,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)
+--- mysql-8.1.0/CMakeLists.txt~        2023-06-21 09:52:10.000000000 +0200
++++ mysql-8.1.0/CMakeLists.txt 2023-10-20 10:08:46.673284042 +0200
+@@ -20,6 +20,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)