CVS commit: pkgsrc/databases/mysql56-client

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Dec 16 17:55:48 UTC 2016

Modified Files:
        pkgsrc/databases/mysql56-client: distinfo
Added Files:
        pkgsrc/databases/mysql56-client/patches: patch-cmake_os_SunOS.cmake

Log Message:
Backport section from MySQL 5.7 to fix SunOS/gcc.  PR#51725


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/databases/mysql56-client/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mysql56-client/patches/patch-cmake_os_SunOS.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mysql56-client/distinfo
diff -u pkgsrc/databases/mysql56-client/distinfo:1.40 pkgsrc/databases/mysql56-client/distinfo:1.41
--- pkgsrc/databases/mysql56-client/distinfo:1.40       Mon Dec 12 19:21:33 2016
+++ pkgsrc/databases/mysql56-client/distinfo    Fri Dec 16 17:55:48 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.40 2016/12/12 19:21:33 adam Exp $
+$NetBSD: distinfo,v 1.41 2016/12/16 17:55:48 jperkin Exp $
 
 SHA1 (mysql-5.6.35.tar.gz) = a971f01d711addd87c860fb534d51139a73d5319
 RMD160 (mysql-5.6.35.tar.gz) = 3a54baba27b940b5c18787a6d213e1cc6530ea28
@@ -14,6 +14,7 @@ SHA1 (patch-client_mysqladmin.cc) = e165
 SHA1 (patch-client_sql_string.h) = f26aff4ce4cf6dfef44c85ef95120331ca8fef52
 SHA1 (patch-cmake_dtrace.cmake) = d953fdf976f3a7e7f0c2c16a9a2d2615f2777396
 SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356
+SHA1 (patch-cmake_os_SunOS.cmake) = 1ef310e6395653be3219044fc2ea58977a1b0ce3
 SHA1 (patch-cmake_plugin.cmake) = 03e7a7debd61e870bd76d5c5b253a620662b3595
 SHA1 (patch-cmake_readline.cmake) = 6bec6ca87b45c739d0614493477a18bb7c56d981
 SHA1 (patch-cmake_ssl.cmake) = a5a25b00010c6586e5a3e099975ddabe369d4247

Added files:

Index: pkgsrc/databases/mysql56-client/patches/patch-cmake_os_SunOS.cmake
diff -u /dev/null pkgsrc/databases/mysql56-client/patches/patch-cmake_os_SunOS.cmake:1.1
--- /dev/null   Fri Dec 16 17:55:48 2016
+++ pkgsrc/databases/mysql56-client/patches/patch-cmake_os_SunOS.cmake  Fri Dec 16 17:55:48 2016
@@ -0,0 +1,21 @@
+$NetBSD: patch-cmake_os_SunOS.cmake,v 1.1 2016/12/16 17:55:48 jperkin Exp $
+
+Backport section from MySQL 5.7 to fix SunOS/gcc.
+
+--- cmake/os/SunOS.cmake.orig  2016-11-28 13:36:22.000000000 +0000
++++ cmake/os/SunOS.cmake
+@@ -19,7 +19,13 @@ INCLUDE(CheckCSourceCompiles)
+ 
+ # We require SunStudio 12u2 (CC 5.11)
+ IF(NOT FORCE_UNSUPPORTED_COMPILER)
+-  IF(CMAKE_C_COMPILER_ID MATCHES "SunPro")
++  IF(CMAKE_COMPILER_IS_GNUCC)
++    EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
++                    OUTPUT_VARIABLE GCC_VERSION)
++    IF(GCC_VERSION VERSION_LESS 4.4)
++      MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
++    ENDIF()
++  ELSEIF(CMAKE_C_COMPILER_ID MATCHES "SunPro")
+     # CC -V yields
+     # CC: Studio 12.5 Sun C++ 5.14 SunOS_sparc Dodona 2016/04/04
+     # CC: Sun C++ 5.13 SunOS_sparc Beta 2014/03/11