Tue Jan 3 12:27:27 2017 UTC ()
Do not attempt to detect ISA, it conflicts with wrappers.  Fixes SunOS.


(jperkin)
diff -r1.5 -r1.6 pkgsrc/databases/mysql57-client/distinfo
diff -r0 -r1.1 pkgsrc/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake
cvs diff -r1.5 -r1.6 pkgsrc/databases/mysql57-client/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql57-client/distinfo 2017/01/01 16:06:06 1.5
+++ pkgsrc/databases/mysql57-client/distinfo 2017/01/03 12:27:27 1.6
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1$NetBSD: distinfo,v 1.5 2017/01/01 16:06:06 adam Exp $ 1$NetBSD: distinfo,v 1.6 2017/01/03 12:27:27 jperkin Exp $
2 2
3SHA1 (mysql-5.7.17.tar.gz) = 7d159e2d056ab6e10c89e0c8ef12ee7af3b99ef0 3SHA1 (mysql-5.7.17.tar.gz) = 7d159e2d056ab6e10c89e0c8ef12ee7af3b99ef0
4RMD160 (mysql-5.7.17.tar.gz) = acd8714fe1bda26466c4490b9e71d510677ac9a5 4RMD160 (mysql-5.7.17.tar.gz) = acd8714fe1bda26466c4490b9e71d510677ac9a5
5SHA512 (mysql-5.7.17.tar.gz) = 72ef29298354234666264497e302994d4965ddc76129f564d51b48cbeb32f1b012a76d0905be238c8818507e0e5cf68d066e11788077351502880a358ea0df4b 5SHA512 (mysql-5.7.17.tar.gz) = 72ef29298354234666264497e302994d4965ddc76129f564d51b48cbeb32f1b012a76d0905be238c8818507e0e5cf68d066e11788077351502880a358ea0df4b
6Size (mysql-5.7.17.tar.gz) = 51433090 bytes 6Size (mysql-5.7.17.tar.gz) = 51433090 bytes
7SHA1 (patch-CMakeLists.txt) = b47592cf8801538375da3df2990fde4d292fc365 7SHA1 (patch-CMakeLists.txt) = b47592cf8801538375da3df2990fde4d292fc365
8SHA1 (patch-client_CMakeLists.txt) = 304023577ab9c2152ca21fa9ff4895a22a321adf 8SHA1 (patch-client_CMakeLists.txt) = 304023577ab9c2152ca21fa9ff4895a22a321adf
9SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb 9SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
10SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93 10SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
11SHA1 (patch-cmake_boost.cmake) = 1f0a70f110d97a1ab47706ed7d79d4fafa084abd 11SHA1 (patch-cmake_boost.cmake) = 1f0a70f110d97a1ab47706ed7d79d4fafa084abd
12SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356 12SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356
 13SHA1 (patch-cmake_os_SunOS.cmake) = f5b44de1cb7e14c33be6ebb961157c67f651df4b
13SHA1 (patch-cmake_plugin.cmake) = 29db9f49941a011176a6cdd46f3af6c5636afb4a 14SHA1 (patch-cmake_plugin.cmake) = 29db9f49941a011176a6cdd46f3af6c5636afb4a
14SHA1 (patch-cmake_readline.cmake) = fb79ed969240ae2984098f72c2d3fb501154902c 15SHA1 (patch-cmake_readline.cmake) = fb79ed969240ae2984098f72c2d3fb501154902c
15SHA1 (patch-include_CMakeLists.txt) = 944991702f046ea7a5e2b6ea4dc390f17426e55a 16SHA1 (patch-include_CMakeLists.txt) = 944991702f046ea7a5e2b6ea4dc390f17426e55a
16SHA1 (patch-include_my__compare.h) = f45bac4b488332a668b0005751856279b67401f5 17SHA1 (patch-include_my__compare.h) = f45bac4b488332a668b0005751856279b67401f5
17SHA1 (patch-include_my__global.h) = 3870266cb1dd2cd0d58417dfe21bab19b62100e2 18SHA1 (patch-include_my__global.h) = 3870266cb1dd2cd0d58417dfe21bab19b62100e2
18SHA1 (patch-include_my__thread.h) = 0f095acf94f8d130516dc4d858de1c64dd2bc127 19SHA1 (patch-include_my__thread.h) = 0f095acf94f8d130516dc4d858de1c64dd2bc127
19SHA1 (patch-include_my__thread__os__id.h) = a51861b791086a0eeb9cb4d64892c5033da8c8eb 20SHA1 (patch-include_my__thread__os__id.h) = a51861b791086a0eeb9cb4d64892c5033da8c8eb
20SHA1 (patch-libmysql_CMakeLists.txt) = 0105627fb9a5be56eaf21cda927589e0ffd99758 21SHA1 (patch-libmysql_CMakeLists.txt) = 0105627fb9a5be56eaf21cda927589e0ffd99758
21SHA1 (patch-mysql-test_CMakeLists.txt) = 4ba56ce255f5f89d9aece93181e54ddb572f301b 22SHA1 (patch-mysql-test_CMakeLists.txt) = 4ba56ce255f5f89d9aece93181e54ddb572f301b
22SHA1 (patch-mysys__ssl_CMakeLists.txt) = 7ec44642cd13c5477175a94a007354c583ca9c3c 23SHA1 (patch-mysys__ssl_CMakeLists.txt) = 7ec44642cd13c5477175a94a007354c583ca9c3c
23SHA1 (patch-mysys_kqueue__timers.c) = 836803e9c7353b813bc22a5b69cc263dea384c9b 24SHA1 (patch-mysys_kqueue__timers.c) = 836803e9c7353b813bc22a5b69cc263dea384c9b
24SHA1 (patch-mysys_stacktrace.c) = 3e0794f544f0e35f44a694330885478247657842 25SHA1 (patch-mysys_stacktrace.c) = 3e0794f544f0e35f44a694330885478247657842
25SHA1 (patch-rapid_plugin_x_CMakeLists.txt) = 4e8ddfbdfa2d4e1f4b5c9421aeb4a337b5741165 26SHA1 (patch-rapid_plugin_x_CMakeLists.txt) = 4e8ddfbdfa2d4e1f4b5c9421aeb4a337b5741165
File Added: pkgsrc/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake
$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.