22112750 Add MySQL 5.7 to Solaris
23047228 Port fix for 23022999 from MySQL 5.6 to 5.7
23053990 Missing --log-error leads to mysqld output in the SMF log
PSARC 2015/501 Include MySQL 5.7 and EOL MySQL 5.5 and 5.6
This patch adds an "cmake" option DISABLE_STATIC that prevent
static libraries built from being installed.
--- a/cmake/libutils.cmake 2016-02-02 00:31:58.000000000 +0100
+++ b/cmake/libutils.cmake 2016-03-02 22:54:28.199045221 +0100
@@ -267,7 +267,7 @@
ELSE()
MESSAGE(FATAL_ERROR "Unknown library type")
ENDIF()
- IF(NOT ARG_NOINSTALL)
+ IF(NOT ARG_NOINSTALL AND NOT ( DISABLE_STATIC AND ARG_STATIC ) )
IF(ARG_COMPONENT)
SET(COMP COMPONENT ${ARG_COMPONENT})
ENDIF()
--- a/CMakeLists.txt 2016-02-02 00:31:58.000000000 +0100
+++ b/CMakeLists.txt 2016-03-02 22:36:49.634297070 +0100
@@ -206,6 +206,8 @@
INCLUDE(mysql_add_executable)
# Handle options
+OPTION(DISABLE_STATIC
+ "Don't build static libraries" OFF)
OPTION(DISABLE_SHARED
"Don't build shared libraries, compile code as position-dependent" OFF)
IF(DISABLE_SHARED)
@@ -223,7 +225,7 @@
OPTION (WITH_UNIT_TESTS "Compile MySQL with unit tests" ON)
ENDIF()
OPTION(FORCE_UNSUPPORTED_COMPILER "Disable compiler version checks" OFF)
-MARK_AS_ADVANCED(WITHOUT_SERVER DISABLE_SHARED FORCE_UNSUPPORTED_COMPILER)
+MARK_AS_ADVANCED(WITHOUT_SERVER DISABLE_STATIC DISABLE_SHARED FORCE_UNSUPPORTED_COMPILER)
include(CheckCSourceCompiles)
--- a/libservices/CMakeLists.txt 2016-02-02 00:31:58.000000000 +0100
+++ b/libservices/CMakeLists.txt 2016-03-02 22:53:28.974537132 +0100
@@ -34,4 +34,6 @@
security_context_service.c)
ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
-INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
+IF(NOT DISABLE_STATIC)
+ INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
+ENDIF()