components/mysql-5-7/patches/dont-bundle-cpp-runtime.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Sat, 14 Jan 2017 13:51:41 -0800
changeset 7578 0d6f61408e89
parent 7472 6cc4607cf459
permissions -rw-r--r--
25395691 cannot install new pulseaudio package with de_CH enabled (fix pkgfmt)

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)