components/mysql-5-7/patches/disable_static_opt.patch
author Jiri Sasek <Jiri.Sasek@Oracle.COM>
Wed, 04 Jan 2017 08:50:00 -0800
branchs11u3-sru
changeset 7603 1ab055abee21
parent 6571 12a891fe6a39
child 7472 6cc4607cf459
permissions -rw-r--r--
25202159 smbclient fails with Not enough '\' characters in service on x86 S11.3.14.6 25309936 nmblookup in samba 4.4.5 has errors on x86 but works on sparc

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()