25372130 Upgrade the version of MySQL 5.5 to 5.5.54 on Solaris
25364635 Upgrade the version of MySQL 5.6 to 5.6.35 on Solaris
25372106 Upgrade the version of MySQL 5.7 to 5.7.17 on Solaris
24835634 Upgrade MySQL server 5.7 to 5.7.15 on Solaris
24688109 Upgrade MySQL 5.5 to 5.5.52 on Solaris
23227671 Upgrade MySQL 5.5 to 5.5.49 on Solaris
15818149 mysql stop method unsafe
18605985 Need to resolve dependencies between MySQL 5.5 database and client pkgs
23227615 Port fix for Bug 23022999 from MySQL 5.6 to 5.5
23227642 Port fix for Bug 23053990 from MySQL 5.6 to 5.5
21150630 mysql SMF instances should check to see if it's really online before returning
22959660 mysql SMF service must not hardcode pid-file, socket and log-error
24708946 Upgrade the version of MySQL 5.6 to 5.6.33 on Solaris
25236651 COMPONENT_ARCHIVE_URL for MySQL-5.6 Makefile is not working
24924801 problem in DATABASE/MYSQL
25427164 problem in DATABASE/MYSQL
25215584 problem in DATABASE/MYSQL
25427149 problem in DATABASE/MYSQL
24923761 problem in DATABASE/MYSQL
25427194 problem in DATABASE/MYSQL
This patch adds an "cmake" option DISABLE_STATIC that prevent
static libraries built from being installed.
--- a/cmake/libutils.cmake
+++ b/cmake/libutils.cmake
@@ -267,7 +267,7 @@ MACRO(MERGE_LIBRARIES)
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
+++ b/CMakeLists.txt
@@ -214,6 +214,8 @@ ELSE()
OPTION(WITH_RAPID
"Build additonal code(plugins) that is located in rapid directory" OFF)
ENDIF()
+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)
@@ -231,7 +233,7 @@ IF(NOT WITHOUT_SERVER)
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
+++ b/libservices/CMakeLists.txt
@@ -35,4 +35,6 @@ SET(MYSQLSERVICES_SOURCES
mysql_keyring_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()