From 9b29bd5522791283616dbe9779ff607c713c1f05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 20 Apr 2021 20:11:13 -0300
Subject: [PATCH] mariadb: fix configure with cmake>=3.20.1.

While here, also move patching for musl to post_patch.
---
 srcpkgs/mariadb/patches/cmake.patch | 15 +++++++++++++++
 srcpkgs/mariadb/template            |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mariadb/patches/cmake.patch

diff --git a/srcpkgs/mariadb/patches/cmake.patch b/srcpkgs/mariadb/patches/cmake.patch
new file mode 100644
index 00000000000..27b4a507e23
--- /dev/null
+++ b/srcpkgs/mariadb/patches/cmake.patch
@@ -0,0 +1,15 @@
+caused configure error after update to cmake 3.20.1
+
+diff --git libmariadb/cmake/ConnectorName.cmake libmariadb/cmake/ConnectorName.cmake
+index b7bbbad..357b8ac 100644
+--- libmariadb/cmake/ConnectorName.cmake
++++ libmariadb/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}")
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8cbc1357da6..e6b8a820277 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -35,7 +35,7 @@ system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
 make_dirs="/var/lib/mysql 0700 mysql mysql"
 
-pre_configure() {
+post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl)
 			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch