From 9958fe9686e708ebf539ede675640ec29ab33b74 Mon Sep 17 00:00:00 2001 From: "Phoebe Ma (Beyondsoft Corporation)" Date: Sun, 13 Jan 2019 20:21:08 -0800 Subject: [PATCH 1/2] Fix issue #5046 --- ports/libmysql/linux_libmysql.patch | 16 ++++++++++++++++ ports/libmysql/portfile.cmake | 1 + 2 files changed, 17 insertions(+) create mode 100644 ports/libmysql/linux_libmysql.patch diff --git a/ports/libmysql/linux_libmysql.patch b/ports/libmysql/linux_libmysql.patch new file mode 100644 index 00000000000000..77cf305b582585 --- /dev/null +++ b/ports/libmysql/linux_libmysql.patch @@ -0,0 +1,16 @@ +--- a/buildtrees/libmysql/src/ysql-8.0.4-6271934d70/configure.cmake ++++ b/buildtrees/libmysql/src/ysql-8.0.4-6271934d70/configure.cmake +@@ -456,7 +456,11 @@ + ENDIF() + + IF(NOT CMAKE_CROSSCOMPILING AND NOT MSVC) +- STRING(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} processor) ++ IF(${CMAKE_SYSTEM_PROCESSOR}) ++ STRING(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} processor) ++ ELSE() ++ STRING(TOLOWER ${CMAKE_HOST_SYSTEM_PROCESSOR} processor) ++ ENDIF() + IF(processor MATCHES "86" OR processor MATCHES "amd64" OR processor MATCHES "x64") + IF(NOT CMAKE_SYSTEM_NAME MATCHES "SunOS") + # The loader in some Solaris versions has a bug due to which it refuses to + diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake index dfd38c41c0158c..75553a75c1492d 100644 --- a/ports/libmysql/portfile.cmake +++ b/ports/libmysql/portfile.cmake @@ -25,6 +25,7 @@ vcpkg_apply_patches( PATCHES ${CMAKE_CURRENT_LIST_DIR}/ignore-boost-version.patch ${CMAKE_CURRENT_LIST_DIR}/system-libs.patch + ${CMAKE_CURRENT_LIST_DIR}/linux_libmysql.patch ) file(REMOVE_RECURSE ${SOURCE_PATH}/include/boost_1_65_0) From a762386ec6b70419d32fc75027b12e9bb7887c32 Mon Sep 17 00:00:00 2001 From: "Phoebe Ma (Beyondsoft Corporation)" Date: Tue, 22 Jan 2019 23:33:41 -0800 Subject: [PATCH 2/2] [libmysql] fix the path that the patch applied --- ports/libmysql/linux_libmysql.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/libmysql/linux_libmysql.patch b/ports/libmysql/linux_libmysql.patch index 77cf305b582585..8e4e80cece8173 100644 --- a/ports/libmysql/linux_libmysql.patch +++ b/ports/libmysql/linux_libmysql.patch @@ -1,5 +1,5 @@ ---- a/buildtrees/libmysql/src/ysql-8.0.4-6271934d70/configure.cmake -+++ b/buildtrees/libmysql/src/ysql-8.0.4-6271934d70/configure.cmake +--- a/configure.cmake ++++ b/configure.cmake @@ -456,7 +456,11 @@ ENDIF()