components/mysql-5-7/patches/dont-bundle-cpp-runtime.patch
branchs11u3-sru
changeset 7765 3495fc32877e
parent 6571 12a891fe6a39
--- a/components/mysql-5-7/patches/dont-bundle-cpp-runtime.patch	Thu Mar 09 10:47:46 2017 -0800
+++ b/components/mysql-5-7/patches/dont-bundle-cpp-runtime.patch	Wed Mar 15 23:29:04 2017 -0700
@@ -1,9 +1,9 @@
 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 @@
+--- 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()
  
@@ -13,9 +13,9 @@
    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 @@
+--- 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.