| author | Jiri Sasek <Jiri.Sasek@Oracle.COM> |
| Fri, 14 Oct 2016 00:06:47 -0700 | |
| branch | s11u3-sru |
| changeset 7106 | d583491a2248 |
| parent 6570 | 255c6d88d419 |
| permissions | -rw-r--r-- |
|
6570
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
1 |
Developed in-house, not fed back. |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
2 |
Solaris-specific |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
3 |
This patch is added so that libmysqlclient.so.18 doesn't contain undefined references |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
4 |
|
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
5 |
--- a/configure.cmake |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
6 |
+++ b/configure.cmake |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
7 |
@@ -67,17 +67,27 @@ |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
8 |
# The default C++ library for SunPro is really old, and not standards compliant. |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
9 |
# http://www.oracle.com/technetwork/server-storage/solaris10/cmp-stlport-libcstd-142559.html |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
10 |
-# Use stlport rather than Rogue Wave. |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
11 |
+# Use stlport rather than Rogue Wave, |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
12 |
+# unless otherwise specified on command line. |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
13 |
IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
14 |
IF(CMAKE_CXX_COMPILER_ID MATCHES "SunPro") |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
15 |
- IF(SUNPRO_CXX_LIBRARY) |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
16 |
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=${SUNPRO_CXX_LIBRARY}")
|
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
17 |
- IF(SUNPRO_CXX_LIBRARY STREQUAL "stdcxx4") |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
18 |
- ADD_DEFINITIONS(-D__MATHERR_RENAME_EXCEPTION) |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
19 |
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -template=extdef")
|
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
20 |
- ENDIF() |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
21 |
+ IF(CMAKE_CXX_FLAGS MATCHES "-std=") |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
22 |
+ ADD_DEFINITIONS(-D__MATHERR_RENAME_EXCEPTION) |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
23 |
+ SET(CMAKE_SHARED_LIBRARY_C_FLAGS |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
24 |
+ "${CMAKE_SHARED_LIBRARY_C_FLAGS} -lc")
|
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
25 |
+ SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
26 |
+ "${CMAKE_SHARED_LIBRARY_CXX_FLAGS} -lstdc++ -lgcc_s -lCrunG3 -lc")
|
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
27 |
+ SET(QUOTED_CMAKE_CXX_LINK_FLAGS "-lstdc++ -lgcc_s -lCrunG3 -lc") |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
28 |
ELSE() |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
29 |
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=stlport4")
|
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
30 |
+ IF(SUNPRO_CXX_LIBRARY) |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
31 |
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=${SUNPRO_CXX_LIBRARY}")
|
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
32 |
+ IF(SUNPRO_CXX_LIBRARY STREQUAL "stdcxx4") |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
33 |
+ ADD_DEFINITIONS(-D__MATHERR_RENAME_EXCEPTION) |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
34 |
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -template=extdef")
|
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
35 |
+ ENDIF() |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
36 |
+ ELSE() |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
37 |
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=stlport4")
|
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
38 |
+ ENDIF() |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
39 |
ENDIF() |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
40 |
ENDIF() |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
41 |
ENDIF() |
|
255c6d88d419
22816574 Upgrade the version of MySQL 5.6 to 5.6.29 on Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
42 |