blob: 7fce8ffc5f3882b93496e8e2824237f19703182d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44842d3..e34ab24 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -452,7 +452,7 @@ ELSE()
SET(DEFAULT_TMPDIR "\"${TMPDIR}\"")
ENDIF()
-INCLUDE(cmake/boost.cmake)
+#INCLUDE(cmake/boost.cmake)
IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
OPTION(WITH_SYSTEMD "Enable installation of systemd support files" OFF)
diff --git a/client/dump/CMakeLists.txt b/client/dump/CMakeLists.txt
index bae2ce7..4e11516 100644
--- a/client/dump/CMakeLists.txt
+++ b/client/dump/CMakeLists.txt
@@ -21,12 +21,12 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/dump
)
-IF (CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
+#IF (CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
IF (WITHOUT_SERVER)
MESSAGE(STATUS "Not building mysqlpump")
RETURN()
ENDIF()
-ENDIF()
+#ENDIF()
# Prevent Boost from including external precompiled Boost libraries, use
# threading (not implemented for older Solaris Studio compilers)
diff --git a/mysys/mysys_priv.h b/mysys/mysys_priv.h
index 8b7a554..4353037 100644
--- a/mysys/mysys_priv.h
+++ b/mysys/mysys_priv.h
@@ -18,6 +18,7 @@
#include "my_global.h"
#include "mysql/psi/mysql_thread.h"
+#include "my_sys.h"
#ifdef HAVE_PSI_INTERFACE
|
