components/mysql-5-7/patches/dont-bundle-cpp-runtime.patch
author Gipson Pulla <gipson.pulla@oracle.com>
Wed, 15 Mar 2017 23:29:04 -0700
branchs11u3-sru
changeset 7765 3495fc32877e
parent 6571 12a891fe6a39
permissions -rw-r--r--
25372130 Upgrade the version of MySQL 5.5 to 5.5.54 on Solaris 25364635 Upgrade the version of MySQL 5.6 to 5.6.35 on Solaris 25372106 Upgrade the version of MySQL 5.7 to 5.7.17 on Solaris 24835634 Upgrade MySQL server 5.7 to 5.7.15 on Solaris 24688109 Upgrade MySQL 5.5 to 5.5.52 on Solaris 23227671 Upgrade MySQL 5.5 to 5.5.49 on Solaris 15818149 mysql stop method unsafe 18605985 Need to resolve dependencies between MySQL 5.5 database and client pkgs 23227615 Port fix for Bug 23022999 from MySQL 5.6 to 5.5 23227642 Port fix for Bug 23053990 from MySQL 5.6 to 5.5 21150630 mysql SMF instances should check to see if it's really online before returning 22959660 mysql SMF service must not hardcode pid-file, socket and log-error 24708946 Upgrade the version of MySQL 5.6 to 5.6.33 on Solaris 25236651 COMPONENT_ARCHIVE_URL for MySQL-5.6 Makefile is not working 24924801 problem in DATABASE/MYSQL 25427164 problem in DATABASE/MYSQL 25215584 problem in DATABASE/MYSQL 25427149 problem in DATABASE/MYSQL 24923761 problem in DATABASE/MYSQL 25427194 problem in DATABASE/MYSQL

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

--- a/configure.cmake
+++ b/configure.cmake
@@ -146,7 +146,7 @@ MACRO(EXTEND_C_LINK_FLAGS LIBRARY_PATH)
     "${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
+++ b/libmysql/CMakeLists.txt
@@ -262,7 +262,7 @@ ENDIF()
 # 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)