| author | Gipson Pulla <gipson.pulla@oracle.com> |
| Wed, 15 Mar 2017 23:29:04 -0700 | |
| branch | s11u3-sru |
| changeset 7765 | 3495fc32877e |
| parent 6571 | 12a891fe6a39 |
| permissions | -rw-r--r-- |
|
6571
12a891fe6a39
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 |
|
12a891fe6a39
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
2 |
static libraries built from being installed. |
|
12a891fe6a39
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
3 |
|
|
7765
3495fc32877e
25372130 Upgrade the version of MySQL 5.5 to 5.5.54 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
6571
diff
changeset
|
4 |
--- a/cmake/libutils.cmake |
|
3495fc32877e
25372130 Upgrade the version of MySQL 5.5 to 5.5.54 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
6571
diff
changeset
|
5 |
+++ b/cmake/libutils.cmake |
|
3495fc32877e
25372130 Upgrade the version of MySQL 5.5 to 5.5.54 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
6571
diff
changeset
|
6 |
@@ -267,7 +267,7 @@ MACRO(MERGE_LIBRARIES) |
|
6571
12a891fe6a39
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
7 |
ELSE() |
|
12a891fe6a39
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
8 |
MESSAGE(FATAL_ERROR "Unknown library type") |
|
12a891fe6a39
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
9 |
ENDIF() |
|
12a891fe6a39
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
10 |
- IF(NOT ARG_NOINSTALL) |
|
12a891fe6a39
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 ) ) |
|
12a891fe6a39
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
12 |
IF(ARG_COMPONENT) |
|
12a891fe6a39
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
13 |
SET(COMP COMPONENT ${ARG_COMPONENT})
|
|
12a891fe6a39
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
14 |
ENDIF() |
|
12a891fe6a39
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
15 |
|
|
7765
3495fc32877e
25372130 Upgrade the version of MySQL 5.5 to 5.5.54 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
6571
diff
changeset
|
16 |
--- a/CMakeLists.txt |
|
3495fc32877e
25372130 Upgrade the version of MySQL 5.5 to 5.5.54 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
6571
diff
changeset
|
17 |
+++ b/CMakeLists.txt |
|
3495fc32877e
25372130 Upgrade the version of MySQL 5.5 to 5.5.54 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
6571
diff
changeset
|
18 |
@@ -214,6 +214,8 @@ ELSE() |
|
3495fc32877e
25372130 Upgrade the version of MySQL 5.5 to 5.5.54 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
6571
diff
changeset
|
19 |
OPTION(WITH_RAPID |
|
3495fc32877e
25372130 Upgrade the version of MySQL 5.5 to 5.5.54 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
6571
diff
changeset
|
20 |
"Build additonal code(plugins) that is located in rapid directory" OFF) |
|
3495fc32877e
25372130 Upgrade the version of MySQL 5.5 to 5.5.54 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
6571
diff
changeset
|
21 |
ENDIF() |
|
3495fc32877e
25372130 Upgrade the version of MySQL 5.5 to 5.5.54 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
6571
diff
changeset
|
22 |
+OPTION(DISABLE_STATIC |
|
6571
12a891fe6a39
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
23 |
+ "Don't build static libraries" OFF) |
|
12a891fe6a39
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
24 |
OPTION(DISABLE_SHARED |
|
12a891fe6a39
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) |
|
12a891fe6a39
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
26 |
IF(DISABLE_SHARED) |
|
7765
3495fc32877e
25372130 Upgrade the version of MySQL 5.5 to 5.5.54 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
6571
diff
changeset
|
27 |
@@ -231,7 +233,7 @@ IF(NOT WITHOUT_SERVER) |
|
6571
12a891fe6a39
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) |
|
12a891fe6a39
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
29 |
ENDIF() |
|
12a891fe6a39
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) |
|
12a891fe6a39
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) |
|
12a891fe6a39
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) |
|
12a891fe6a39
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
33 |
|
|
12a891fe6a39
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
34 |
|
|
12a891fe6a39
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
35 |
include(CheckCSourceCompiles) |
|
12a891fe6a39
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
36 |
|
|
7765
3495fc32877e
25372130 Upgrade the version of MySQL 5.5 to 5.5.54 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
6571
diff
changeset
|
37 |
--- a/libservices/CMakeLists.txt |
|
3495fc32877e
25372130 Upgrade the version of MySQL 5.5 to 5.5.54 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
6571
diff
changeset
|
38 |
+++ b/libservices/CMakeLists.txt |
|
3495fc32877e
25372130 Upgrade the version of MySQL 5.5 to 5.5.54 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
6571
diff
changeset
|
39 |
@@ -35,4 +35,6 @@ SET(MYSQLSERVICES_SOURCES |
|
3495fc32877e
25372130 Upgrade the version of MySQL 5.5 to 5.5.54 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
6571
diff
changeset
|
40 |
mysql_keyring_service.c) |
|
6571
12a891fe6a39
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
41 |
|
|
12a891fe6a39
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
42 |
ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
|
|
12a891fe6a39
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)
|
|
12a891fe6a39
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
44 |
+IF(NOT DISABLE_STATIC) |
|
12a891fe6a39
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)
|
|
12a891fe6a39
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
46 |
+ENDIF() |