1 |
commit: c6fec9cf21f30d91c9b00711f501bada8f37b9f7 |
2 |
Author: Brian Evans <grknight <AT> tuffmail <DOT> com> |
3 |
AuthorDate: Mon Mar 31 18:05:23 2014 +0000 |
4 |
Commit: Brian Evans <grknight <AT> lavabit <DOT> com> |
5 |
CommitDate: Mon Mar 31 18:05:23 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=c6fec9cf |
7 |
|
8 |
Fix bad percona patch for 5.6.16 |
9 |
|
10 |
--- |
11 |
20006_all_cmake_elib-percona-5.6.16.patch | 7 +++---- |
12 |
1 file changed, 3 insertions(+), 4 deletions(-) |
13 |
|
14 |
diff --git a/20006_all_cmake_elib-percona-5.6.16.patch b/20006_all_cmake_elib-percona-5.6.16.patch |
15 |
index 608daad..b1a2a0b 100644 |
16 |
--- a/20006_all_cmake_elib-percona-5.6.16.patch |
17 |
+++ b/20006_all_cmake_elib-percona-5.6.16.patch |
18 |
@@ -104,19 +104,18 @@ diff -ur mysql-old/libmysql/CMakeLists.txt mysql/libmysql/CMakeLists.txt |
19 |
+ |
20 |
# Merge several convenience libraries into one big perconaserverclient |
21 |
-MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development) |
22 |
-+MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development OUTPUT_DIR ${INSTALL_LIBDIR} $INSTALL_STATIC_LIBS}) |
23 |
++MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development OUTPUT_DIR ${INSTALL_LIBDIR} ${INSTALL_STATIC_LIBS}) |
24 |
|
25 |
# Visual Studio users need debug static library for debug projects |
26 |
INSTALL_DEBUG_SYMBOLS(clientlib) |
27 |
-@@ -210,10 +215,12 @@ |
28 |
+@@ -210,9 +215,11 @@ |
29 |
ENDIF() |
30 |
|
31 |
IF(UNIX) |
32 |
-- GET_TARGET_NAME(perconaserverclient lib_name) |
33 |
+ GET_TARGET_NAME(perconaserverclient lib_name) |
34 |
- INSTALL_SYMLINK(perconaserverclient |
35 |
- ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a |
36 |
- ${INSTALL_LIBDIR} Development) |
37 |
-+ GET_TARGET_NAME(perconaserverclient lib_name)\ |
38 |
+ IF(ENABLE_STATIC_LIBS) |
39 |
+ INSTALL_SYMLINK(perconaserverclient |
40 |
+ ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a |