Fix libmariadb compiling on ARM64

microsoft · Jan 18, 2021 · 7726a0f · 7726a0f
1 parent b60f003
commit 7726a0f
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 3 deletions.
diff --git a/port_versions/baseline.json b/port_versions/baseline.json
@@ -3074,7 +3074,7 @@
     },
     "libmariadb": {
       "baseline": "3.1.10",
-      "port-version": 4
+      "port-version": 5
     },
     "libmaxminddb": {
       "baseline": "1.4.3",

diff --git a/port_versions/l-/libmariadb.json b/port_versions/l-/libmariadb.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "674b0c8bcc3ee3276a0bce8afd72b99c5013f4a0",
+      "version-string": "3.1.10",
+      "port-version": 5
+    },
     {
       "git-tree": "a5144f1b965487813bfd011e1d7ca18877d2ec69",
       "version-string": "3.1.10",

diff --git a/ports/libmariadb/CONTROL b/ports/libmariadb/CONTROL
@@ -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

diff --git a/ports/libmariadb/arm64.patch b/ports/libmariadb/arm64.patch
@@ -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")
diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake
@@ -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