CVS commit: pkgsrc/databases/mysql57-client

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Oct 31 12:04:22 UTC 2019

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

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/databases/mysql57-client/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/databases/mysql57-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/mysql57-client/distinfo
diff -u pkgsrc/databases/mysql57-client/distinfo:1.32 pkgsrc/databases/mysql57-client/distinfo:1.33
--- pkgsrc/databases/mysql57-client/distinfo:1.32       Mon Oct 14 20:19:29 2019
+++ pkgsrc/databases/mysql57-client/distinfo    Thu Oct 31 12:04:22 2019
@@ -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) =
 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

Index: pkgsrc/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake
diff -u pkgsrc/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake:1.2 pkgsrc/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake:1.3
--- pkgsrc/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake:1.2      Tue Apr 11 20:49:15 2017
+++ pkgsrc/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake  Thu Oct 31 12:04:22 2019
@@ -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 conflic
  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 conflic
  
  # 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(