|
1 Developed in-house, not fed back. |
|
2 Solaris-specific |
|
3 This patch is added so that libmysqlclient.so.18 doesn't contain undefined references |
|
4 |
|
5 --- a/configure.cmake |
|
6 +++ b/configure.cmake |
|
7 @@ -67,17 +67,27 @@ |
|
8 # The default C++ library for SunPro is really old, and not standards compliant. |
|
9 # http://www.oracle.com/technetwork/server-storage/solaris10/cmp-stlport-libcstd-142559.html |
|
10 -# Use stlport rather than Rogue Wave. |
|
11 +# Use stlport rather than Rogue Wave, |
|
12 +# unless otherwise specified on command line. |
|
13 IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") |
|
14 IF(CMAKE_CXX_COMPILER_ID MATCHES "SunPro") |
|
15 - IF(SUNPRO_CXX_LIBRARY) |
|
16 - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=${SUNPRO_CXX_LIBRARY}") |
|
17 - IF(SUNPRO_CXX_LIBRARY STREQUAL "stdcxx4") |
|
18 - ADD_DEFINITIONS(-D__MATHERR_RENAME_EXCEPTION) |
|
19 - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -template=extdef") |
|
20 - ENDIF() |
|
21 + IF(CMAKE_CXX_FLAGS MATCHES "-std=") |
|
22 + ADD_DEFINITIONS(-D__MATHERR_RENAME_EXCEPTION) |
|
23 + SET(CMAKE_SHARED_LIBRARY_C_FLAGS |
|
24 + "${CMAKE_SHARED_LIBRARY_C_FLAGS} -lc") |
|
25 + SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS |
|
26 + "${CMAKE_SHARED_LIBRARY_CXX_FLAGS} -lstdc++ -lgcc_s -lCrunG3 -lc") |
|
27 + SET(QUOTED_CMAKE_CXX_LINK_FLAGS "-lstdc++ -lgcc_s -lCrunG3 -lc") |
|
28 ELSE() |
|
29 - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=stlport4") |
|
30 + IF(SUNPRO_CXX_LIBRARY) |
|
31 + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=${SUNPRO_CXX_LIBRARY}") |
|
32 + IF(SUNPRO_CXX_LIBRARY STREQUAL "stdcxx4") |
|
33 + ADD_DEFINITIONS(-D__MATHERR_RENAME_EXCEPTION) |
|
34 + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -template=extdef") |
|
35 + ENDIF() |
|
36 + ELSE() |
|
37 + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=stlport4") |
|
38 + ENDIF() |
|
39 ENDIF() |
|
40 ENDIF() |
|
41 ENDIF() |
|
42 |