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

[libmariadb] Fix compiling on ARM64 #15699

Merged
merged 1 commit into from
Jan 20, 2021
+24 −3
Merged

[libmariadb] Fix compiling on ARM64 #15699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 port_versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3074,7 +3074,7 @@
},
"libmariadb": {
"baseline": "3.1.10",
"port-version": 4
"port-version": 5
},
"libmaxminddb": {
"baseline": "1.4.3",
Expand Down
5 changes: 5 additions & 0 deletions port_versions/l-/libmariadb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "674b0c8bcc3ee3276a0bce8afd72b99c5013f4a0",
"version-string": "3.1.10",
"port-version": 5
},
{
"git-tree": "a5144f1b965487813bfd011e1d7ca18877d2ec69",
"version-string": "3.1.10",
Expand Down
2 changes: 1 addition & 1 deletion ports/libmariadb/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: libmariadb
Version: 3.1.10
Port-Version: 4
Port-Version: 5
Homepage: https://github.com/MariaDB/mariadb-connector-c
Description: MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases
Default-Features: zlib, openssl
Expand Down
15 changes: 15 additions & 0 deletions ports/libmariadb/arm64.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
index 640a35bea..6c8d93250 100755
--- a/libmariadb/CMakeLists.txt
+++ b/libmariadb/CMakeLists.txt
@@ -410,10 +410,6 @@ TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS})

SIGN_TARGET(libmariadb)

-IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC)
- SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
-ENDIF()
-
IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR
CMAKE_SYSTEM_NAME MATCHES "kFreeBSD" OR
CMAKE_SYSTEM_NAME MATCHES "GNU")
3 changes: 2 additions & 1 deletion ports/libmariadb/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO MariaDB/mariadb-connector-c
REF 159540fe8c8f30b281748fe8a1b79e8b17993a67 # v3.1.10
REF 159540fe8c8f30b281748fe8a1b79e8b17993a67 # v3.1.10
SHA512 3e154f5dc4b5051607c7ebc0691a50c0699d60e4414660cf8f65689081ff78ef6b135667761ba8ac4163b469a3b55158c6b48c6fc0a0cc09381452aad157e4ad
HEAD_REF 3.1
PATCHES
arm64.patch
md.patch
disable-test-build.patch
fix-InstallPath.patch
Expand Down