From e7abc2fd3c8de79b220fd33d3d3102531f22256c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jaramago=20Fern=C3=A1ndez?= Date: Thu, 2 Dec 2021 18:05:05 +0100 Subject: [PATCH] Fixed compilation issue for 'mariadb-client-library' due to CMake typo #3714 --- deps/Makefile | 1 + deps/mariadb-client-library/ConnectorName.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 deps/mariadb-client-library/ConnectorName.patch diff --git a/deps/Makefile b/deps/Makefile index ef6856dcd..21e02c0f9 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -173,6 +173,7 @@ mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a: libssl/open cd mariadb-client-library && rm -rf mariadb-connector-c-3.1.9-src 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 -p0 < ../ConnectorName.patch cd mariadb-client-library/mariadb_client && cmake . -DOPENSSL_ROOT_DIR=$(shell pwd)/libssl/openssl/ -DOPENSSL_LIBRARIES=$(shell pwd)/libssl/openssl/ . # cd mariadb-client-library/mariadb_client && cmake . -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl # this is needed on MacOSX cd mariadb-client-library/mariadb_client && patch libmariadb/mariadb_stmt.c < ../mariadb_stmt.c.patch diff --git a/deps/mariadb-client-library/ConnectorName.patch b/deps/mariadb-client-library/ConnectorName.patch new file mode 100644 index 000000000..3227bd1d7 --- /dev/null +++ b/deps/mariadb-client-library/ConnectorName.patch @@ -0,0 +1,13 @@ +diff --git cmake/ConnectorName.cmake cmake/ConnectorName.cmake +index b7bbbad..357b8ac 100644 +--- cmake/ConnectorName.cmake ++++ cmake/ConnectorName.cmake +@@ -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}")