| author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
| Thu, 08 Sep 2016 12:41:54 -0700 | |
| changeset 6865 | 1cc50ab79b8c |
| parent 5884 | ef644c2bdc65 |
| child 7472 | 6cc4607cf459 |
| child 7765 | 3495fc32877e |
| permissions | -rw-r--r-- |
|
5884
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
1 |
Userland uses dependencies on C++ runtime libraries, disable |
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
2 |
the bundling of libraries in the install and packages |
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
3 |
|
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
4 |
--- a/configure.cmake Mon Feb 1 15:31:58 2016 |
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
5 |
+++ b/configure.cmake Tue Mar 1 07:59:05 2016 |
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
6 |
@@ -126,7 +126,7 @@ |
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
7 |
"${CMAKE_SHARED_LIBRARY_C_FLAGS} -R'\$ORIGIN/../lib' -R${LIBRARY_PATH}")
|
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
8 |
ENDMACRO() |
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
9 |
|
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
10 |
-IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCC) |
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
11 |
+IF(FALSE AND CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCC) |
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
12 |
DIRNAME(${CMAKE_CXX_COMPILER} CXX_PATH)
|
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
13 |
SET(LIB_SUFFIX "lib") |
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
14 |
IF(SIZEOF_VOIDP EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc") |
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
15 |
|
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
16 |
--- a/libmysql/CMakeLists.txt Mon Feb 1 15:31:58 2016 |
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
17 |
+++ b/libmysql/CMakeLists.txt Tue Mar 1 08:03:03 2016 |
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
18 |
@@ -246,7 +246,7 @@ |
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
19 |
# In our special "mixed" builds, also install libstlport which will |
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
20 |
# be injected into the build tree by the Sun Studio part of the build. |
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
21 |
|
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
22 |
-IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND DEFINED ENV{PB2WORKDIR})
|
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
23 |
+IF(FALSE AND CMAKE_SYSTEM_NAME MATCHES "SunOS" AND DEFINED ENV{PB2WORKDIR})
|
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
24 |
INSTALL(FILES ${CMAKE_BINARY_DIR}/libstlport.so
|
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
25 |
${CMAKE_BINARY_DIR}/libstlport.so.1
|
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
26 |
DESTINATION ${INSTALL_LIBDIR} COMPONENT SharedLibraries OPTIONAL)
|