mysql-cmake.patch

   1 --- Percona-Server-5.6.15-rel63.0/cmake/readline.cmake.orig     2013-12-18 10:52:13.000000000 +0100
   2 +++ Percona-Server-5.6.15-rel63.0/cmake/readline.cmake  2014-02-09 06:17:56.079619159 +0100
   3 @@ -131,23 +131,23 @@
   4
   5  MACRO (FIND_SYSTEM_EDITLINE)
   6    FIND_PATH(FOUND_EDITLINE_READLINE
   7 -    NAMES editline/readline.h
   8 +    NAMES readline/readline.h
   9    )
  10    IF(FOUND_EDITLINE_READLINE)
  11 -    SET(EDITLINE_INCLUDE_DIR "${FOUND_EDITLINE_READLINE}/editline")
  12 +    SET(EDITLINE_INCLUDE_DIR "${FOUND_EDITLINE_READLINE}/readline")
  13    ELSE()
  14      # Different path on FreeBSD
  15      FIND_PATH(FOUND_EDIT_READLINE_READLINE
  16        NAMES edit/readline/readline.h
  17      )
  18      IF(FOUND_EDIT_READLINE_READLINE)
  19 -      SET(EDITLINE_INCLUDE_DIR "${FOUND_EDIT_READLINE_READLINE}/edit/readline")
  20 +      SET(EDITLINE_INCLUDE_DIR "${FOUND_EDIT_READLINE_READLINE}/readline")
  21      ENDIF()
  22    ENDIF()
  23
  24    FIND_LIBRARY(EDITLINE_LIBRARY
  25      NAMES
  26 -    edit
  27 +    readline
  28    )
  29    MARK_AS_ADVANCED(EDITLINE_INCLUDE_DIR EDITLINE_LIBRARY)
  30
  31 @@ -160,7 +160,7 @@
  32      SET(CMAKE_REQUIRED_LIBRARIES ${EDITLINE_LIBRARY})
  33      CHECK_CXX_SOURCE_COMPILES("
  34      #include <stdio.h>
  35 -    #include <readline.h>
  36 +    #include <readline/history.h>
  37      int main(int argc, char **argv)
  38      {
  39         HIST_ENTRY entry;
  40 @@ -170,14 +170,13 @@
  41
  42      CHECK_CXX_SOURCE_COMPILES("
  43      #include <stdio.h>
  44 -    #include <readline.h>
  45 +    #include <readline/readline.h>
  46      int main(int argc, char **argv)
  47      {
  48 -      typedef int MYFunction(const char*, int);
  49 -      MYFunction* myf= rl_completion_entry_function;
  50 -      int res= (myf)(NULL, 0);
  51 -      completion_matches(0,0);
  52 -      return res;
  53 +      rl_compentry_func_t *myf= rl_completion_entry_function;
  54 +      char *res= (myf)(NULL, 0);
  55 +      rl_completion_matches(0,0);
  56 +      return res ? 0 : 1;
  57      }"
  58      EDITLINE_HAVE_COMPLETION)
  59