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