Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[libmysql]Fix build error in linux. #6442

Merged
merged 3 commits into from
Jun 11, 2019
Merged

[libmysql]Fix build error in linux. #6442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a282bf
[libmysql]Fix build error in linux.
May 14, 2019
2f42313
[libmysql] Fix typo in prerequisites message
vicroms May 14, 2019
a9ed1f7
[libmysql]Re-trigger CI system.
Jun 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/libmysql/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: libmysql
Version: 8.0.4-3
Version: 8.0.4-4
Build-Depends: boost-algorithm, boost-geometry, boost-optional, boost-functional, boost-graph, openssl, icu, libevent, liblzma, lz4, zlib
Description: A MySQL client library for C development.
18 changes: 18 additions & 0 deletions ports/libmysql/linux_libmysql.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
diff --git a/configure.cmake b/configure.cmake
index 1f3d8e2..9e45f48 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -456,7 +456,11 @@ IF(NOT HAVE_FCNTL_NONBLOCK)
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

19 changes: 10 additions & 9 deletions ports/libmysql/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND NOT CMAKE_SYSTEM_NAME OR CMAKE_S
message(FATAL_ERROR "Oracle has dropped support in libmysql for 32-bit Windows.")
endif()

if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
message(WARNING "libmysql needs ncurses on LINUX, please install ncurses first.\nOn Debian/Ubuntu, package name is libncurses5-dev, on Redhat and derivates it is ncurses-devel.")
endif()

include(vcpkg_common_functions)

vcpkg_from_github(
Expand All @@ -18,13 +22,10 @@ vcpkg_from_github(
REF mysql-8.0.4
SHA512 8d9129e7670e88df14238299052a5fe6d4f3e40bf27ef7a3ca8f4f91fb40507b13463e9bd24435b34e5d06c5d056dfb259fb04e77cc251b188eea734db5642be
HEAD_REF master
)

vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/ignore-boost-version.patch
${CMAKE_CURRENT_LIST_DIR}/system-libs.patch
ignore-boost-version.patch
system-libs.patch
linux_libmysql.patch
)

file(REMOVE_RECURSE ${SOURCE_PATH}/include/boost_1_65_0)
Expand Down Expand Up @@ -100,13 +101,13 @@ else()
${CURRENT_PACKAGES_DIR}/lib/mysqlclient.lib
${CURRENT_PACKAGES_DIR}/debug/lib/mysqlclient.lib)

# correct the dll directory
# correct the dll directory
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
file (RENAME ${CURRENT_PACKAGES_DIR}/lib/libmysql.dll ${CURRENT_PACKAGES_DIR}/bin/libmysql.dll)
file (RENAME ${CURRENT_PACKAGES_DIR}/lib/libmysql.pdb ${CURRENT_PACKAGES_DIR}/bin/libmysql.pdb)
endif()

if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
file (RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libmysql.dll ${CURRENT_PACKAGES_DIR}/debug/bin/libmysql.dll)
Expand All @@ -120,4 +121,4 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/include/mysql/mysql_com.h "${_contents}")

# copy license
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)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/libmysql/LICENSE ${CURRENT_PACKAGES_DIR}/share/libmysql/copyright)