diff options
Diffstat (limited to 'databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake')
| -rw-r--r-- | databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake | 18 |
1 files changed, 14 insertions, 4 deletions
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( |