Blob Blame History Raw
This patch fixes:

* Building mariadb library with cmake >= 3.20
  Fix is waiting to be merged with upstream:
  https://github.com/sysown/proxysql/pull/3402
  Patch should be removed when fix is merged.

--- /dev/null	2021-08-05 12:43:33.896002409 +0000
+++ b/deps/mariadb-client-library/connector_cmake.patch	2021-08-06 09:53:13.556452181 +0000
@@ -0,0 +1,9 @@
+@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
+     SET(MACHINE_NAME "x64")
+   ELSE()
+     SET(MACHINE_NAME "32")
+-  END()
++  ENDIF()
+ ENDIF()
+ 
+ SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
diff --git a/deps/Makefile b/deps/Makefile
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -128,4 +128,5 @@
 	cd mariadb-client-library && tar -zxf mariadb-connector-c-3.1.9-src.tar.gz
 	cd mariadb-client-library/mariadb_client && patch ./plugins/auth/CMakeLists.txt < ../plugin_auth_CMakeLists.txt.patch
+	cd mariadb-client-library/mariadb_client && patch cmake/ConnectorName.cmake < ../connector_cmake.patch
 	cd mariadb-client-library/mariadb_client && cmake . -DOPENSSL_ROOT_DIR=usr/include/openssl/ -DOPENSSL_LIBRARIES=/usr/bin .
 #	cd mariadb-client-library/mariadb_client && cmake . -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl # this is needed on MacOSX