mariadb: fix configure with cmake>=3.20.1.

While here, also move patching for musl to post_patch.
This commit is contained in:
Érico Nogueira 2021-04-20 20:11:13 -03:00
parent a93027c876
commit 9b29bd5522
2 changed files with 16 additions and 1 deletions

View file

@ -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}")

View file

@ -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