components/mysql-5-7/patches/disable_static_opt.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Fri, 07 Apr 2017 17:56:36 -0700
changeset 7851 f82a18f72950
parent 7472 6cc4607cf459
permissions -rw-r--r--
Close of build 122.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5884
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
     1
This patch adds an "cmake" option DISABLE_STATIC that prevent
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
     2
static libraries built from being installed.
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
     3
7472
6cc4607cf459 24835634 Upgrade MySQL server 5.7 to 5.7.15 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents: 5884
diff changeset
     4
--- a/cmake/libutils.cmake
6cc4607cf459 24835634 Upgrade MySQL server 5.7 to 5.7.15 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents: 5884
diff changeset
     5
+++ b/cmake/libutils.cmake
6cc4607cf459 24835634 Upgrade MySQL server 5.7 to 5.7.15 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents: 5884
diff changeset
     6
@@ -267,7 +267,7 @@ MACRO(MERGE_LIBRARIES)
5884
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
     7
   ELSE()
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
     8
     MESSAGE(FATAL_ERROR "Unknown library type")
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
     9
   ENDIF()
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    10
-  IF(NOT ARG_NOINSTALL)
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    11
+  IF(NOT ARG_NOINSTALL AND NOT ( DISABLE_STATIC AND ARG_STATIC ) )
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    12
     IF(ARG_COMPONENT)
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    13
       SET(COMP COMPONENT ${ARG_COMPONENT}) 
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    14
     ENDIF()
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    15
7472
6cc4607cf459 24835634 Upgrade MySQL server 5.7 to 5.7.15 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents: 5884
diff changeset
    16
--- a/CMakeLists.txt
6cc4607cf459 24835634 Upgrade MySQL server 5.7 to 5.7.15 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents: 5884
diff changeset
    17
+++ b/CMakeLists.txt
6cc4607cf459 24835634 Upgrade MySQL server 5.7 to 5.7.15 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents: 5884
diff changeset
    18
@@ -214,6 +214,8 @@ ELSE()
6cc4607cf459 24835634 Upgrade MySQL server 5.7 to 5.7.15 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents: 5884
diff changeset
    19
   OPTION(WITH_RAPID
6cc4607cf459 24835634 Upgrade MySQL server 5.7 to 5.7.15 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents: 5884
diff changeset
    20
     "Build additonal code(plugins) that is located in rapid directory" OFF)
6cc4607cf459 24835634 Upgrade MySQL server 5.7 to 5.7.15 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents: 5884
diff changeset
    21
 ENDIF()
6cc4607cf459 24835634 Upgrade MySQL server 5.7 to 5.7.15 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents: 5884
diff changeset
    22
+OPTION(DISABLE_STATIC
5884
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    23
+ "Don't build static libraries" OFF)
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    24
 OPTION(DISABLE_SHARED 
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    25
  "Don't build shared libraries, compile code as position-dependent" OFF)
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    26
 IF(DISABLE_SHARED)
7472
6cc4607cf459 24835634 Upgrade MySQL server 5.7 to 5.7.15 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents: 5884
diff changeset
    27
@@ -231,7 +233,7 @@ IF(NOT WITHOUT_SERVER)
5884
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    28
   OPTION (WITH_UNIT_TESTS "Compile MySQL with unit tests" ON)
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    29
 ENDIF()
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    30
 OPTION(FORCE_UNSUPPORTED_COMPILER "Disable compiler version checks" OFF)
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    31
-MARK_AS_ADVANCED(WITHOUT_SERVER DISABLE_SHARED FORCE_UNSUPPORTED_COMPILER)
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    32
+MARK_AS_ADVANCED(WITHOUT_SERVER DISABLE_STATIC DISABLE_SHARED FORCE_UNSUPPORTED_COMPILER)
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    33
 
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    34
 
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    35
 include(CheckCSourceCompiles)
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    36
7472
6cc4607cf459 24835634 Upgrade MySQL server 5.7 to 5.7.15 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents: 5884
diff changeset
    37
--- a/libservices/CMakeLists.txt
6cc4607cf459 24835634 Upgrade MySQL server 5.7 to 5.7.15 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents: 5884
diff changeset
    38
+++ b/libservices/CMakeLists.txt
6cc4607cf459 24835634 Upgrade MySQL server 5.7 to 5.7.15 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents: 5884
diff changeset
    39
@@ -35,4 +35,6 @@ SET(MYSQLSERVICES_SOURCES
6cc4607cf459 24835634 Upgrade MySQL server 5.7 to 5.7.15 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents: 5884
diff changeset
    40
   mysql_keyring_service.c)
5884
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    41
 
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    42
 ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    43
-INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    44
+IF(NOT DISABLE_STATIC)
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    45
+  INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
ef644c2bdc65 22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff changeset
    46
+ENDIF()