Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mysql-extras:master commit in: /
Date: Fri, 01 Mar 2013 02:47:36
Message-Id: 1361987333.f15bfea3c776a0feee358c29ffa0859b75ba9ed7.robbat2@gentoo
1 commit: f15bfea3c776a0feee358c29ffa0859b75ba9ed7
2 Author: Brian Evans <grknight <AT> lavabit <DOT> com>
3 AuthorDate: Wed Feb 27 17:48:53 2013 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 27 17:48:53 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=f15bfea3
7
8 Fix bad CMake references to zlib and readline in 5.6
9
10 ---
11 00000_index.txt | 5 +++++
12 20003_all_fix-5.6-library.patch | 26 ++++++++++++++++++++++++++
13 2 files changed, 31 insertions(+), 0 deletions(-)
14
15 diff --git a/00000_index.txt b/00000_index.txt
16 index 5829392..25a2422 100644
17 --- a/00000_index.txt
18 +++ b/00000_index.txt
19 @@ -1466,3 +1466,8 @@
20 @ver 5.06.00.00 to 5.99.99.99
21 @pn mysql
22 @@ Bug 442000, upstream 62729 compilation failure on arm and possibly other arches where va_list is a struct or array.
23 +
24 +@patch 20003_all_fix-5.6-library.patch
25 +@ver 5.06.00.00 to 5.99.99.99
26 +@pn mysql
27 +@@ Fix bad references to zlib and readline upstream bugs 68277 and 68087
28
29 diff --git a/20003_all_fix-5.6-library.patch b/20003_all_fix-5.6-library.patch
30 new file mode 100644
31 index 0000000..ab207e5
32 --- /dev/null
33 +++ b/20003_all_fix-5.6-library.patch
34 @@ -0,0 +1,26 @@
35 +--- mysql-5.6-5.6.9-rc+dfsg.orig/cmake/readline.cmake
36 ++++ mysql-5.6-5.6.9-rc+dfsg/cmake/readline.cmake
37 +@@ -192,9 +192,9 @@ MACRO (MYSQL_CHECK_READLINE)
38 + IF(WITH_LIBEDIT)
39 + MYSQL_USE_BUNDLED_LIBEDIT()
40 + ELSE()
41 +- FIND_SYSTEM_LIBEDIT(edit)
42 +- IF(NOT_LIBEDIT_FOUND)
43 +- MESSAGE(FATAL_ERROR "Cannot find system libedit libraries.Use WITH_LIBEDIT")
44 ++ FIND_SYSTEM_LIBEDIT(readline)
45 ++ IF(NOT_LIBREADLINE_FOUND)
46 ++ MESSAGE(FATAL_ERROR "Cannot find system libreadline libraries.Use WITH_LIBREADLINE")
47 + ENDIF()
48 + ENDIF()
49 + ENDIF(NOT WIN32)
50 +--- a/storage/perfschema/unittest/CMakeLists.txt 2013-02-27 10:45:29.559846643 -0500
51 ++++ b/storage/perfschema/unittest/CMakeLists.txt 2013-02-27 10:45:59.459430483 -0500
52 +@@ -63,7 +63,7 @@
53 + TARGET_LINK_LIBRARIES(pfs_connect_attr-t sql binlog rpl master slave sql)
54 + TARGET_LINK_LIBRARIES(pfs_connect_attr-t mysys mysys_ssl)
55 + TARGET_LINK_LIBRARIES(pfs_connect_attr-t vio ${SSL_LIBRARIES})
56 +-TARGET_LINK_LIBRARIES(pfs_connect_attr-t strings dbug regex mysys zlib)
57 ++TARGET_LINK_LIBRARIES(pfs_connect_attr-t strings dbug regex mysys ${ZLIB_LIBRARY})
58 + ADD_TEST(pfs_connect_attr pfs_connect_attr-t)
59 +
60 + # On windows, pfs_connect_attr-t may depend on openssl dlls.