diff options
| author | jperkin <jperkin@pkgsrc.org> | 2019-10-31 12:04:22 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2019-10-31 12:04:22 +0000 |
| commit | 40ff33b58bfa1cffe822eb0bd4a83f5d92f5a107 (patch) | |
| tree | 481fd795c4f4e07f5fbcc1a3aeaf446fec424cdd /databases/mysql57-client | |
| parent | c72c996683d2cec44c63440dc4f56cb27eee15ca (diff) | |
| download | pkgsrc-40ff33b58bfa1cffe822eb0bd4a83f5d92f5a107.tar.gz | |
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.
Diffstat (limited to 'databases/mysql57-client')
| -rw-r--r-- | databases/mysql57-client/distinfo | 4 | ||||
| -rw-r--r-- | databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake | 18 |
2 files changed, 16 insertions, 6 deletions
diff --git a/databases/mysql57-client/distinfo b/databases/mysql57-client/distinfo index 0b904a48f2a..681e2fc9588 100644 --- a/databases/mysql57-client/distinfo +++ b/databases/mysql57-client/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.32 2019/10/14 20:19:29 adam Exp $ +$NetBSD: distinfo,v 1.33 2019/10/31 12:04:22 jperkin Exp $ SHA1 (mysql-5.7.28.tar.gz) = 93d5c460f32576c92f95d9d81938e1d15ece1ae4 RMD160 (mysql-5.7.28.tar.gz) = 2ab8cddf7479aac8f5eaddd5a23cd4ee62b042d3 @@ -10,7 +10,7 @@ SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ec SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93 SHA1 (patch-cmake_boost.cmake) = ecf03b396c57c69e0d251497e7217e47632613c2 SHA1 (patch-cmake_build__configurations_mysql__release.cmake) = 7a1fb8c686f187db8fd9d8ad203c1f764d6e55a6 -SHA1 (patch-cmake_os_SunOS.cmake) = 06e290820a75d68931fce6dfd70a0b5edd548320 +SHA1 (patch-cmake_os_SunOS.cmake) = b71c3e1fafb48ebbba77c19bb1c31556ebe1ad2a SHA1 (patch-cmake_plugin.cmake) = 4480438969e297f67890b1974a86fb88a23d28ed SHA1 (patch-cmake_readline.cmake) = fb79ed969240ae2984098f72c2d3fb501154902c SHA1 (patch-cmd-line-utils_libedit_chartype.h) = 6b1453df648001ed1fc81190106e15872a69a04c diff --git a/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake b/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake index 383b844cb59..b6c858ac878 100644 --- a/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake +++ b/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake @@ -1,10 +1,11 @@ -$NetBSD: patch-cmake_os_SunOS.cmake,v 1.2 2017/04/11 20:49:15 adam Exp $ +$NetBSD: patch-cmake_os_SunOS.cmake,v 1.3 2019/10/31 12:04:22 jperkin Exp $ Do not attempt to detect ISA, it conflicts with wrappers. +Disable HAVE_SOLARIS_LARGE_PAGES, only supported on Oracle Solaris. ---- cmake/os/SunOS.cmake.orig 2017-03-18 07:45:14.000000000 +0000 +--- cmake/os/SunOS.cmake.orig 2019-09-27 07:00:15.000000000 +0000 +++ cmake/os/SunOS.cmake -@@ -62,6 +62,7 @@ ADD_DEFINITIONS(-D__EXTENSIONS__) +@@ -77,6 +77,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) @@ -12,7 +13,7 @@ Do not attempt to detect ISA, it conflicts with wrappers. IF (NOT "${CMAKE_C_FLAGS}${CMAKE_CXX_FLAGS}" MATCHES "-m32|-m64") EXECUTE_PROCESS(COMMAND isainfo -b OUTPUT_VARIABLE ISAINFO_B -@@ -86,6 +87,7 @@ ELSE() +@@ -101,6 +102,7 @@ ELSE() SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -m64") ENDIF() ENDIF() @@ -20,3 +21,12 @@ Do not attempt to detect ISA, it conflicts with wrappers. # On Solaris, use of intrinsics will screw the lib search logic # Force using -lm, so rint etc are found. +@@ -111,7 +113,7 @@ SET(LIBM m) + SET(CMAKE_THREAD_LIBS_INIT -lpthread CACHE INTERNAL "" FORCE) + + # Solaris specific large page support +-CHECK_SYMBOL_EXISTS(MHA_MAPSIZE_VA sys/mman.h HAVE_SOLARIS_LARGE_PAGES) ++#CHECK_SYMBOL_EXISTS(MHA_MAPSIZE_VA sys/mman.h HAVE_SOLARIS_LARGE_PAGES) + + # Solaris atomics + CHECK_C_SOURCE_RUNS( |