Thu Oct 31 12:04:22 2019 UTC ()
mysql57: Disable HAVE_SOLARIS_LARGE_PAGES.

The current code uses functions that are only available in newer releases of
Oracle Solaris, so disable for now to fix illumos and others.  This could be
improved with proper feature tests.


(jperkin)
diff -r1.32 -r1.33 pkgsrc/databases/mysql57-client/distinfo
diff -r1.2 -r1.3 pkgsrc/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake
cvs diff -r1.32 -r1.33 pkgsrc/databases/mysql57-client/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql57-client/distinfo 2019/10/14 20:19:29 1.32
+++ pkgsrc/databases/mysql57-client/distinfo 2019/10/31 12:04:22 1.33
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: distinfo,v 1.32 2019/10/14 20:19:29 adam Exp $ 1$NetBSD: distinfo,v 1.33 2019/10/31 12:04:22 jperkin Exp $
2 2
3SHA1 (mysql-5.7.28.tar.gz) = 93d5c460f32576c92f95d9d81938e1d15ece1ae4 3SHA1 (mysql-5.7.28.tar.gz) = 93d5c460f32576c92f95d9d81938e1d15ece1ae4
4RMD160 (mysql-5.7.28.tar.gz) = 2ab8cddf7479aac8f5eaddd5a23cd4ee62b042d3 4RMD160 (mysql-5.7.28.tar.gz) = 2ab8cddf7479aac8f5eaddd5a23cd4ee62b042d3
5SHA512 (mysql-5.7.28.tar.gz) = fa96cdf8d748a0cc12e01ddf8662e2ebd3a8e6474e38ec94f8c1bc1c6b590b9f60a95d91e7a9157ba2c06043b6cbe9426dc018e1fe33ec23ef8d1db7aa8ee0d6 5SHA512 (mysql-5.7.28.tar.gz) = fa96cdf8d748a0cc12e01ddf8662e2ebd3a8e6474e38ec94f8c1bc1c6b590b9f60a95d91e7a9157ba2c06043b6cbe9426dc018e1fe33ec23ef8d1db7aa8ee0d6
6Size (mysql-5.7.28.tar.gz) = 54419008 bytes 6Size (mysql-5.7.28.tar.gz) = 54419008 bytes
7SHA1 (patch-CMakeLists.txt) = 1409a98380c999c6973fa3106dc35684b7c3b3cc 7SHA1 (patch-CMakeLists.txt) = 1409a98380c999c6973fa3106dc35684b7c3b3cc
8SHA1 (patch-client_CMakeLists.txt) = 4af2fb3f3d05a66a9ee89f3653e2fcccadfa5f79 8SHA1 (patch-client_CMakeLists.txt) = 4af2fb3f3d05a66a9ee89f3653e2fcccadfa5f79
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) = ecf03b396c57c69e0d251497e7217e47632613c2 11SHA1 (patch-cmake_boost.cmake) = ecf03b396c57c69e0d251497e7217e47632613c2
12SHA1 (patch-cmake_build__configurations_mysql__release.cmake) = 7a1fb8c686f187db8fd9d8ad203c1f764d6e55a6 12SHA1 (patch-cmake_build__configurations_mysql__release.cmake) = 7a1fb8c686f187db8fd9d8ad203c1f764d6e55a6
13SHA1 (patch-cmake_os_SunOS.cmake) = 06e290820a75d68931fce6dfd70a0b5edd548320 13SHA1 (patch-cmake_os_SunOS.cmake) = b71c3e1fafb48ebbba77c19bb1c31556ebe1ad2a
14SHA1 (patch-cmake_plugin.cmake) = 4480438969e297f67890b1974a86fb88a23d28ed 14SHA1 (patch-cmake_plugin.cmake) = 4480438969e297f67890b1974a86fb88a23d28ed
15SHA1 (patch-cmake_readline.cmake) = fb79ed969240ae2984098f72c2d3fb501154902c 15SHA1 (patch-cmake_readline.cmake) = fb79ed969240ae2984098f72c2d3fb501154902c
16SHA1 (patch-cmd-line-utils_libedit_chartype.h) = 6b1453df648001ed1fc81190106e15872a69a04c 16SHA1 (patch-cmd-line-utils_libedit_chartype.h) = 6b1453df648001ed1fc81190106e15872a69a04c
17SHA1 (patch-cmd-line-utils_libedit_vi.c) = 7c5ce1d07f650815d028e435a59e5d078ec74c2f 17SHA1 (patch-cmd-line-utils_libedit_vi.c) = 7c5ce1d07f650815d028e435a59e5d078ec74c2f
18SHA1 (patch-include_CMakeLists.txt) = 944991702f046ea7a5e2b6ea4dc390f17426e55a 18SHA1 (patch-include_CMakeLists.txt) = 944991702f046ea7a5e2b6ea4dc390f17426e55a
19SHA1 (patch-include_my__compare.h) = f45bac4b488332a668b0005751856279b67401f5 19SHA1 (patch-include_my__compare.h) = f45bac4b488332a668b0005751856279b67401f5
20SHA1 (patch-include_my__global.h) = 3870266cb1dd2cd0d58417dfe21bab19b62100e2 20SHA1 (patch-include_my__global.h) = 3870266cb1dd2cd0d58417dfe21bab19b62100e2
21SHA1 (patch-include_my__thread.h) = 0f095acf94f8d130516dc4d858de1c64dd2bc127 21SHA1 (patch-include_my__thread.h) = 0f095acf94f8d130516dc4d858de1c64dd2bc127
22SHA1 (patch-include_my__thread__os__id.h) = a51861b791086a0eeb9cb4d64892c5033da8c8eb 22SHA1 (patch-include_my__thread__os__id.h) = a51861b791086a0eeb9cb4d64892c5033da8c8eb
23SHA1 (patch-libmysql_CMakeLists.txt) = 13b3aa65a82e0e94f097d0092e46b0b9558fdfc6 23SHA1 (patch-libmysql_CMakeLists.txt) = 13b3aa65a82e0e94f097d0092e46b0b9558fdfc6
24SHA1 (patch-mysql-test_CMakeLists.txt) = 8a8e846792077101a01731c4577c37161f70264d 24SHA1 (patch-mysql-test_CMakeLists.txt) = 8a8e846792077101a01731c4577c37161f70264d
25SHA1 (patch-mysys__ssl_CMakeLists.txt) = 753c4f5ed1884e1a3c79d645af6d5ffd027ff7dd 25SHA1 (patch-mysys__ssl_CMakeLists.txt) = 753c4f5ed1884e1a3c79d645af6d5ffd027ff7dd
26SHA1 (patch-mysys_kqueue__timers.c) = 836803e9c7353b813bc22a5b69cc263dea384c9b 26SHA1 (patch-mysys_kqueue__timers.c) = 836803e9c7353b813bc22a5b69cc263dea384c9b
cvs diff -r1.2 -r1.3 pkgsrc/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake (expand / switch to unified diff)

--- pkgsrc/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake 2017/04/11 20:49:15 1.2
+++ pkgsrc/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake 2019/10/31 12:04:22 1.3
@@ -1,22 +1,32 @@ @@ -1,22 +1,32 @@
1$NetBSD: patch-cmake_os_SunOS.cmake,v 1.2 2017/04/11 20:49:15 adam Exp $ 1$NetBSD: patch-cmake_os_SunOS.cmake,v 1.3 2019/10/31 12:04:22 jperkin Exp $
2 2
3Do not attempt to detect ISA, it conflicts with wrappers. 3Do not attempt to detect ISA, it conflicts with wrappers.
 4Disable HAVE_SOLARIS_LARGE_PAGES, only supported on Oracle Solaris.
4 5
5--- cmake/os/SunOS.cmake.orig 2017-03-18 07:45:14.000000000 +0000 6--- cmake/os/SunOS.cmake.orig 2019-09-27 07:00:15.000000000 +0000
6+++ cmake/os/SunOS.cmake 7+++ cmake/os/SunOS.cmake
7@@ -62,6 +62,7 @@ ADD_DEFINITIONS(-D__EXTENSIONS__) 8@@ -77,6 +77,7 @@ ADD_DEFINITIONS(-D__EXTENSIONS__)
8 # http://docs.oracle.com/cd/E19455-01/806-5257/6je9h033k/index.html 9 # http://docs.oracle.com/cd/E19455-01/806-5257/6je9h033k/index.html
9 ADD_DEFINITIONS(-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -D_PTHREADS) 10 ADD_DEFINITIONS(-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -D_PTHREADS)
10  11
11+IF (0) 12+IF (0)
12 IF (NOT "${CMAKE_C_FLAGS}${CMAKE_CXX_FLAGS}" MATCHES "-m32|-m64") 13 IF (NOT "${CMAKE_C_FLAGS}${CMAKE_CXX_FLAGS}" MATCHES "-m32|-m64")
13 EXECUTE_PROCESS(COMMAND isainfo -b 14 EXECUTE_PROCESS(COMMAND isainfo -b
14 OUTPUT_VARIABLE ISAINFO_B 15 OUTPUT_VARIABLE ISAINFO_B
15@@ -86,6 +87,7 @@ ELSE() 16@@ -101,6 +102,7 @@ ELSE()
16 SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -m64") 17 SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -m64")
17 ENDIF() 18 ENDIF()
18 ENDIF() 19 ENDIF()
19+ENDIF() 20+ENDIF()
20  21
21 # On Solaris, use of intrinsics will screw the lib search logic 22 # On Solaris, use of intrinsics will screw the lib search logic
22 # Force using -lm, so rint etc are found. 23 # Force using -lm, so rint etc are found.
 24@@ -111,7 +113,7 @@ SET(LIBM m)
 25 SET(CMAKE_THREAD_LIBS_INIT -lpthread CACHE INTERNAL "" FORCE)
 26
 27 # Solaris specific large page support
 28-CHECK_SYMBOL_EXISTS(MHA_MAPSIZE_VA sys/mman.h HAVE_SOLARIS_LARGE_PAGES)
 29+#CHECK_SYMBOL_EXISTS(MHA_MAPSIZE_VA sys/mman.h HAVE_SOLARIS_LARGE_PAGES)
 30
 31 # Solaris atomics
 32 CHECK_C_SOURCE_RUNS(