components/mysql-5-7/patches/dont-bundle-cpp-runtime.patch
author Gipson Pulla <gipson.pulla@oracle.com>
Fri, 29 Apr 2016 09:42:35 -0700
changeset 5884 ef644c2bdc65
child 7472 6cc4607cf459
child 7765 3495fc32877e
permissions -rw-r--r--
22112750 Add MySQL 5.7 to Solaris 23047228 Port fix for 23022999 from MySQL 5.6 to 5.7 23053990 Missing --log-error leads to mysqld output in the SMF log PSARC 2015/501 Include MySQL 5.7 and EOL MySQL 5.5 and 5.6

Userland uses dependencies on C++ runtime libraries, disable
the bundling of libraries in the install and packages

--- a/configure.cmake	Mon Feb  1 15:31:58 2016
+++ b/configure.cmake	Tue Mar  1 07:59:05 2016
@@ -126,7 +126,7 @@
     "${CMAKE_SHARED_LIBRARY_C_FLAGS} -R'\$ORIGIN/../lib' -R${LIBRARY_PATH}")
 ENDMACRO()
 
-IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCC)
+IF(FALSE AND CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCC)
   DIRNAME(${CMAKE_CXX_COMPILER} CXX_PATH)
   SET(LIB_SUFFIX "lib")
   IF(SIZEOF_VOIDP EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")

--- a/libmysql/CMakeLists.txt	Mon Feb  1 15:31:58 2016
+++ b/libmysql/CMakeLists.txt	Tue Mar  1 08:03:03 2016
@@ -246,7 +246,7 @@
 # In our special "mixed" builds, also install libstlport which will
 # be injected into the build tree by the Sun Studio part of the build.
 
-IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND DEFINED ENV{PB2WORKDIR})
+IF(FALSE AND CMAKE_SYSTEM_NAME MATCHES "SunOS" AND DEFINED ENV{PB2WORKDIR})
   INSTALL(FILES ${CMAKE_BINARY_DIR}/libstlport.so
                 ${CMAKE_BINARY_DIR}/libstlport.so.1
           DESTINATION ${INSTALL_LIBDIR} COMPONENT SharedLibraries OPTIONAL)