diff options
| author | Remi Collet <fedora@famillecollet.com> | 2010-12-22 23:48:46 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2010-12-22 23:48:46 +0100 |
| commit | ac7ec5480251afad46992904099e982a3a821bd5 (patch) | |
| tree | 33b3440c50d407865407e0a7f85f72089acc3d47 | |
| parent | 7677317f083f057c1898411b52d6d399746dd63e (diff) | |
mysql 5.5.8 add readline patch for EL-5 build
| -rw-r--r-- | mysql-5.5-readline.patch | 20 | ||||
| -rw-r--r-- | mysql-dev.spec | 2 |
2 files changed, 22 insertions, 0 deletions
diff --git a/mysql-5.5-readline.patch b/mysql-5.5-readline.patch new file mode 100644 index 0000000..9636913 --- /dev/null +++ b/mysql-5.5-readline.patch @@ -0,0 +1,20 @@ +--- mysql-5.5.8/cmake/readline.cmake.readline 2010-12-03 18:58:26.000000000 +0100 ++++ mysql-5.5.8/cmake/readline.cmake 2010-12-22 23:11:19.641789020 +0100 +@@ -139,7 +139,7 @@ + + IF(${name}_LIBRARY AND ${name}_INCLUDE_DIR) + SET(SYSTEM_READLINE_FOUND 1) +- SET(CMAKE_REQUIRED_LIBRARIES ${${name}_LIBRARY}) ++ SET(CMAKE_REQUIRED_LIBRARIES ${${name}_LIBRARY} ncurses) + CHECK_CXX_SOURCE_COMPILES(" + #include <stdio.h> + #include <readline/readline.h> +@@ -172,7 +172,7 @@ + ${name}_USE_NEW_READLINE_INTERFACE) + + IF(${name}_USE_LIBEDIT_INTERFACE OR ${name}_USE_NEW_READLINE_INTERFACE) +- SET(READLINE_LIBRARY ${${name}_LIBRARY}) ++ SET(READLINE_LIBRARY ${${name}_LIBRARY} ncurses) + SET(READLINE_INCLUDE_DIR ${${name}_INCLUDE_DIR}) + SET(HAVE_HIST_ENTRY ${${name}_HAVE_HIST_ENTRY}) + SET(USE_LIBEDIT_INTERFACE ${${name}_USE_LIBEDIT_INTERFACE}) diff --git a/mysql-dev.spec b/mysql-dev.spec index ee2e8e0..c87a7e5 100644 --- a/mysql-dev.spec +++ b/mysql-dev.spec @@ -51,6 +51,7 @@ Patch18: mysql-5.5-report.patch # ABI check fails on client_plugin.h (seems a preprocessor issue) # Patch19: mysql-5.5-abi.patch Patch20: mysql-5.5-layout.patch +Patch21: mysql-5.5-readline.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gperf, perl, readline-devel, openssl-devel @@ -207,6 +208,7 @@ sed -i -e '/SHARED_LIB_MAJOR_VERSION/s/16/161/' cmake/mysql_version.cmake %patch18 -p1 -b .missing # %patch19 -p1 %patch20 -p1 -b .layout +%patch21 -p1 -b .readline # workaround for upstream bug #56342 rm -f mysql-test/t/ssl_8k_key-master.opt |