From cd6f68b0163b43e0670c1c418ae654d17e68e0a7 Mon Sep 17 00:00:00 2001
From: jperkin <jperkin>
Date: Tue, 3 Jan 2017 12:27:27 +0000
Subject: Do not attempt to detect ISA, it conflicts with wrappers.  Fixes
 SunOS.

---
 databases/mysql57-client/distinfo                  |  3 ++-
 .../patches/patch-cmake_os_SunOS.cmake             | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake

(limited to 'databases/mysql57-client')

diff --git a/databases/mysql57-client/distinfo b/databases/mysql57-client/distinfo
index 48a758560f1..33e815323d2 100644
--- a/databases/mysql57-client/distinfo
+++ b/databases/mysql57-client/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2017/01/01 16:06:06 adam Exp $
+$NetBSD: distinfo,v 1.6 2017/01/03 12:27:27 jperkin Exp $
 
 SHA1 (mysql-5.7.17.tar.gz) = 7d159e2d056ab6e10c89e0c8ef12ee7af3b99ef0
 RMD160 (mysql-5.7.17.tar.gz) = acd8714fe1bda26466c4490b9e71d510677ac9a5
@@ -10,6 +10,7 @@ SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ec
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
 SHA1 (patch-cmake_boost.cmake) = 1f0a70f110d97a1ab47706ed7d79d4fafa084abd
 SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356
+SHA1 (patch-cmake_os_SunOS.cmake) = f5b44de1cb7e14c33be6ebb961157c67f651df4b
 SHA1 (patch-cmake_plugin.cmake) = 29db9f49941a011176a6cdd46f3af6c5636afb4a
 SHA1 (patch-cmake_readline.cmake) = fb79ed969240ae2984098f72c2d3fb501154902c
 SHA1 (patch-include_CMakeLists.txt) = 944991702f046ea7a5e2b6ea4dc390f17426e55a
diff --git a/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake b/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake
new file mode 100644
index 00000000000..831a36ae8c4
--- /dev/null
+++ b/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake
@@ -0,0 +1,22 @@
+$NetBSD: patch-cmake_os_SunOS.cmake,v 1.1 2017/01/03 12:27:27 jperkin Exp $
+
+Do not attempt to detect ISA, it conflicts with wrappers.
+
+--- cmake/os/SunOS.cmake.orig	2016-11-28 13:32:52.000000000 +0000
++++ cmake/os/SunOS.cmake
+@@ -61,6 +61,7 @@ ADD_DEFINITIONS(-D__EXTENSIONS__)
+ # http://docs.oracle.com/cd/E19455-01/806-5257/6je9h033k/index.html
+ ADD_DEFINITIONS(-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -D_PTHREADS)
+ 
++IF (0)
+ IF (NOT "${CMAKE_C_FLAGS}${CMAKE_CXX_FLAGS}" MATCHES "-m32|-m64")
+   EXECUTE_PROCESS(COMMAND isainfo -b
+     OUTPUT_VARIABLE ISAINFO_B
+@@ -75,6 +76,7 @@ IF (NOT "${CMAKE_C_FLAGS}${CMAKE_CXX_FLA
+     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m${ISAINFO_B}")
+   ENDIF()
+ ENDIF()
++ENDIF()
+ 
+ # On  Solaris, use of intrinsics will screw the lib search logic
+ # Force using -lm, so rint etc are found.
-- 
cgit v1.2.3