diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-01-20 14:39:01 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-01-20 14:39:01 -0800 |
| commit | 4aa85cddefa07f4e46ed20838874ec28ce0ab0e7 (patch) | |
| tree | f6bb161719afc28f116e25b5750f1a5cf7117089 /ports/libmysql/boost_and_build.patch | |
| parent | d6e2ea075cd2afa363f6973c74ef599e8794e3d1 (diff) | |
| parent | a5b381f1789014db0b9030dddbf82c94799fecca (diff) | |
| download | vcpkg-4aa85cddefa07f4e46ed20838874ec28ce0ab0e7.tar.gz vcpkg-4aa85cddefa07f4e46ed20838874ec28ce0ab0e7.zip | |
Merge branch 'sdcb-mysql-5.7.17'
Diffstat (limited to 'ports/libmysql/boost_and_build.patch')
| -rw-r--r-- | ports/libmysql/boost_and_build.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/ports/libmysql/boost_and_build.patch b/ports/libmysql/boost_and_build.patch new file mode 100644 index 000000000..7fce8ffc5 --- /dev/null +++ b/ports/libmysql/boost_and_build.patch @@ -0,0 +1,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 + |