commit: d6639476c960c995eef16ad260a362d555e49e0e
Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Mon Mar 10 20:02:15 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Mon Mar 10 20:02:15 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=d6639476
Add static-libs install to patches for embedded as well
---
20006_all_cmake_elib-mariadb-5.5.33.patch | 28 ++++++++++++----------------
20006_all_cmake_elib-mysql-5.5.35.patch | 10 ++++++++--
20006_all_cmake_elib-mysql-5.6.15.patch | 10 ++++++++--
20006_all_cmake_elib-percona-5.5.35.patch | 10 ++++++++--
20006_all_cmake_elib-percona-5.6.15.patch | 10 ++++++++--
5 files changed, 44 insertions(+), 24 deletions(-)
diff --git a/20006_all_cmake_elib-mariadb-5.5.33.patch
b/20006_all_cmake_elib-mariadb-5.5.33.patch
index 516abbd..33e902b 100644
--- a/20006_all_cmake_elib-mariadb-5.5.33.patch
+++ b/20006_all_cmake_elib-mariadb-5.5.33.patch
@@ -118,16 +118,22 @@ diff -ur mysql-old/libmysql/CMakeLists.txt
mysql/libmysql/CMakeLists.txt
diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt
--- mysql-old/libmysqld/CMakeLists.txt 2014-01-18 22:28:40.090273457 -0100
+++ mysql/libmysqld/CMakeLists.txt 2014-01-18 22:28:53.025273949 -0100
-@@ -134,7 +134,7 @@
+@@ -133,8 +133,13 @@
+ ENDIF()
ENDFOREACH()
++SET(INSTALL_STATIC_LIBS "")
++IF(NOT ENABLE_STATIC_LIBS)
++ SET(INSTALL_STATIC_LIBS "NOINSTALL")
++ENDIF()
++
MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS}
- OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Development)
-+ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Development OUTPUT_DIR
${INSTALL_ELIBDIR})
++ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Development OUTPUT_DIR
${INSTALL_ELIBDIR} ${INSTALL_STATIC_LIBS})
- # Visual Studio users need debug static library
- IF(MSVC)
-@@ -142,7 +142,7 @@
+ INSTALL(FILES embedded_priv.h DESTINATION ${INSTALL_INCLUDEDIR}/private
COMPONENT Development)
+
+@@ -144,7 +149,7 @@
ENDIF()
IF(UNIX)
@@ -136,7 +142,7 @@ diff -ur mysql-old/libmysqld/CMakeLists.txt
mysql/libmysqld/CMakeLists.txt
${CMAKE_STATIC_LIBRARY_PREFIX}mysqld-debug)
ENDIF()
-@@ -161,7 +161,7 @@
+@@ -163,7 +168,7 @@
IF(NOT DISABLE_SHARED)
MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${EMBEDDED_API}
@@ -145,13 +151,3 @@ diff -ur mysql-old/libmysqld/CMakeLists.txt
mysql/libmysqld/CMakeLists.txt
IF(UNIX)
# Name the shared library, handle versioning (provides same api as client
# library hence the same version)
---- mysql-old/libservices/CMakeLists.txt 2014-02-06 14:35:25.162325748 -0500
-+++ mysql/libservices/CMakeLists.txt 2014-02-06 14:36:20.051137978 -0500
-@@ -26,4 +26,6 @@
- logger_service.c)
-
- ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
--INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT
Development)
-+IF(ENABLE_STATIC_LIBS)
-+ INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT
Development)
-+ENDIF()
diff --git a/20006_all_cmake_elib-mysql-5.5.35.patch
b/20006_all_cmake_elib-mysql-5.5.35.patch
index 9d478cc..2946025 100644
--- a/20006_all_cmake_elib-mysql-5.5.35.patch
+++ b/20006_all_cmake_elib-mysql-5.5.35.patch
@@ -123,12 +123,18 @@ diff -ur mysql-old/libmysql/CMakeLists.txt
mysql/libmysql/CMakeLists.txt
diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt
--- mysql-old/libmysqld/CMakeLists.txt 2014-01-20 00:14:06.453799634 -0100
+++ mysql/libmysqld/CMakeLists.txt 2014-01-20 00:25:46.375826250 -0100
-@@ -127,7 +127,7 @@
+@@ -126,8 +126,13 @@
+ ENDIF()
ENDFOREACH()
++SET(INSTALL_STATIC_LIBS "")
++IF(NOT ENABLE_STATIC_LIBS)
++ SET(INSTALL_STATIC_LIBS "NOINSTALL")
++ENDIF()
++
MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS}
- OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded)
-+ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded OUTPUT_DIR
${INSTALL_ELIBDIR})
++ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded OUTPUT_DIR
${INSTALL_ELIBDIR} ${INSTALL_STATIC_LIBS})
# Visual Studio users need debug static library
IF(MSVC)
diff --git a/20006_all_cmake_elib-mysql-5.6.15.patch
b/20006_all_cmake_elib-mysql-5.6.15.patch
index 735cfa8..66b7280 100644
--- a/20006_all_cmake_elib-mysql-5.6.15.patch
+++ b/20006_all_cmake_elib-mysql-5.6.15.patch
@@ -126,12 +126,18 @@ diff -ur mysql-old/libmysql/CMakeLists.txt
mysql/libmysql/CMakeLists.txt
diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt
--- mysql-old/libmysqld/CMakeLists.txt 2014-01-20 00:14:06.453799634 -0100
+++ mysql/libmysqld/CMakeLists.txt 2014-01-20 00:25:46.375826250 -0100
-@@ -127,7 +127,7 @@
+@@ -126,8 +126,13 @@
+ ENDIF()
ENDFOREACH()
++SET(INSTALL_STATIC_LIBS "")
++IF(NOT ENABLE_STATIC_LIBS)
++ SET(INSTALL_STATIC_LIBS "NOINSTALL")
++ENDIF()
++
MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS}
- OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded)
-+ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded OUTPUT_DIR
${INSTALL_ELIBDIR})
++ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded OUTPUT_DIR
${INSTALL_ELIBDIR} ${INSTALL_STATIC_LIBS})
# Visual Studio users need debug static library
IF(MSVC)
diff --git a/20006_all_cmake_elib-percona-5.5.35.patch
b/20006_all_cmake_elib-percona-5.5.35.patch
index 65f53a5..1d41852 100644
--- a/20006_all_cmake_elib-percona-5.5.35.patch
+++ b/20006_all_cmake_elib-percona-5.5.35.patch
@@ -123,12 +123,18 @@ diff -ur mysql-old/libmysql/CMakeLists.txt
mysql/libmysql/CMakeLists.txt
diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt
--- mysql-old/libmysqld/CMakeLists.txt 2014-01-20 00:14:06.453799634 -0100
+++ mysql/libmysqld/CMakeLists.txt 2014-01-20 00:25:46.375826250 -0100
-@@ -127,7 +127,7 @@
+@@ -126,8 +126,13 @@
+ ENDIF()
ENDFOREACH()
++SET(INSTALL_STATIC_LIBS "")
++IF(NOT ENABLE_STATIC_LIBS)
++ SET(INSTALL_STATIC_LIBS "NOINSTALL")
++ENDIF()
++
MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS}
- OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded)
-+ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded OUTPUT_DIR
${INSTALL_ELIBDIR})
++ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded OUTPUT_DIR
${INSTALL_ELIBDIR} ${INSTALL_STATIC_LIBS})
# Visual Studio users need debug static library
IF(MSVC)
diff --git a/20006_all_cmake_elib-percona-5.6.15.patch
b/20006_all_cmake_elib-percona-5.6.15.patch
index 69987af..d805b2c 100644
--- a/20006_all_cmake_elib-percona-5.6.15.patch
+++ b/20006_all_cmake_elib-percona-5.6.15.patch
@@ -126,12 +126,18 @@ diff -ur mysql-old/libmysql/CMakeLists.txt
mysql/libmysql/CMakeLists.txt
diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt
--- mysql-old/libmysqld/CMakeLists.txt 2014-01-20 00:14:06.453799634 -0100
+++ mysql/libmysqld/CMakeLists.txt 2014-01-20 00:25:46.375826250 -0100
-@@ -127,7 +127,7 @@
+@@ -126,8 +126,13 @@
+ ENDIF()
ENDFOREACH()
++SET(INSTALL_STATIC_LIBS "")
++IF(NOT ENABLE_STATIC_LIBS)
++ SET(INSTALL_STATIC_LIBS "NOINSTALL")
++ENDIF()
++
MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS}
- OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded)
-+ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded OUTPUT_DIR
${INSTALL_ELIBDIR})
++ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded OUTPUT_DIR
${INSTALL_ELIBDIR} ${INSTALL_STATIC_LIBS})
# Visual Studio users need debug static library
IF(MSVC)
