4 files changed, 30 insertions, 53 deletions
diff --git a/ports/libmysql/CONTROL b/ports/libmysql/CONTROL
index 8350014e4..6a069b78e 100644
--- a/ports/libmysql/CONTROL
+++ b/ports/libmysql/CONTROL
@@ -1,3 +1,4 @@
 Source: libmysql
-Version: 5.7.17-3
+Version: 8.0.4
+Build-Depends: boost-algorithm, boost-geometry, boost-optional, boost-functional, boost-graph
 Description: A MySQL client library for C development.
diff --git a/ports/libmysql/boost_and_build.patch b/ports/libmysql/boost_and_build.patch
deleted file mode 100644
index 7fce8ffc5..000000000
--- a/ports/libmysql/boost_and_build.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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
- 
diff --git a/ports/libmysql/ignore-boost-version.patch b/ports/libmysql/ignore-boost-version.patch
new file mode 100644
index 000000000..ea7111ded
--- /dev/null
+++ b/ports/libmysql/ignore-boost-version.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/boost.cmake b/cmake/boost.cmake
+index 2851181..8788322 100644
+--- a/cmake/boost.cmake
++++ b/cmake/boost.cmake
+@@ -280,7 +280,7 @@ IF(NOT BOOST_MAJOR_VERSION EQUAL 10)
+   COULD_NOT_FIND_BOOST()
+ ENDIF()
+ 
+-IF(NOT BOOST_MINOR_VERSION EQUAL 65)
++IF(NOT BOOST_MINOR_VERSION EQUAL 65 AND NOT IGNORE_BOOST_VERSION)
+   MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} "
+     "we need 65"
+     )
diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake
index dee383a81..d3a7a569d 100644
--- a/ports/libmysql/portfile.cmake
+++ b/ports/libmysql/portfile.cmake
@@ -6,22 +6,27 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     message(FATAL_ERROR "libmysql cannot currently be cross-compiled for UWP")
 endif()
 
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+    message(FATAL_ERROR "32-bit builds are not supported by libmysql.")
+endif()
+
 include(vcpkg_common_functions)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mysql/mysql-server
-    REF mysql-5.7.17
-    SHA512 31488972e08a6b83f88e6e3f7923aca91e01eac702f4942fdae92e13f66d92ac86c24dfe7a65a001db836c900147d1c3871b36af8cbb281a0e6c555617cac12c
+    REF mysql-8.0.4
+    SHA512 8d9129e7670e88df14238299052a5fe6d4f3e40bf27ef7a3ca8f4f91fb40507b13463e9bd24435b34e5d06c5d056dfb259fb04e77cc251b188eea734db5642be
     HEAD_REF master
 )
 
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/boost_and_build.patch
+    PATCHES ${CMAKE_CURRENT_LIST_DIR}/ignore-boost-version.patch
 )
 
+file(REMOVE_RECURSE ${SOURCE_PATH}/include/boost_1_65_0)
+
 set(STACK_DIRECTION)
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
     set(STACK_DIRECTION -DSTACK_DIRECTION=-1)
@@ -29,6 +34,7 @@ endif()
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
     OPTIONS
         -DWITHOUT_SERVER=ON
         -DWITH_UNIT_TESTS=OFF
@@ -37,6 +43,7 @@ vcpkg_configure_cmake(
         -DHAVE_LLVM_LIBCPP_EXITCODE=1
         ${STACK_DIRECTION}
         -DWINDOWS_RUNTIME_MD=ON # Note: this disables _replacement_ of /MD with /MT. If /MT is specified, it will be preserved.
+        -DIGNORE_BOOST_VERSION=ON
 )
 
 vcpkg_install_cmake()
@@ -62,9 +69,9 @@ file(REMOVE_RECURSE
 
 # remove misc files
 file(REMOVE
-    ${CURRENT_PACKAGES_DIR}/COPYING
+    ${CURRENT_PACKAGES_DIR}/LICENSE
     ${CURRENT_PACKAGES_DIR}/README
-    ${CURRENT_PACKAGES_DIR}/debug/COPYING
+    ${CURRENT_PACKAGES_DIR}/debug/LICENSE
     ${CURRENT_PACKAGES_DIR}/debug/README)
 
 # remove not-related libs
@@ -95,5 +102,5 @@ else()
 endif()
 
 # copy license
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmysql)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/libmysql/COPYING ${CURRENT_PACKAGES_DIR}/share/libmysql/copyright)
-\ No newline at end of file
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmysql)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/libmysql/LICENSE ${CURRENT_PACKAGES_DIR}/share/libmysql/copyright)
+\ No newline at end of file