From e459ed46227a319e7c2bc254c40fc1d3c02e7ef4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 11 Feb 2021 13:56:33 +0100
Subject: [PATCH] mariadb: actually fix the my_safe_print_str error properly

this is not cross-related
---
 .../mariadb/patches/fix-test-stacktrace.patch | 21 +++++++++++++++++++
 srcpkgs/mariadb/template                      |  4 ----
 2 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/mariadb/patches/fix-test-stacktrace.patch

diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
new file mode 100644
index 00000000000..54a068bf06e
--- /dev/null
+++ b/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
@@ -0,0 +1,21 @@
+https://jira.mariadb.org/browse/MDEV-24131
+
+diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
+index 8fa0db15b36..67eb099028e 100644
+--- unittest/mysys/stacktrace-t.c
++++ unittest/mysys/stacktrace-t.c
+@@ -22,6 +22,14 @@
+ 
+ char b_bss[10];
+ 
++#ifndef HAVE_STACKTRACE
++int  my_safe_print_str(const char* val, size_t max_len)
++{
++  printf("%*s\n", (int) max_len, val);
++  return 0;
++}
++#endif
++
+ void test_my_safe_print_str()
+ {
+   char b_stack[10];
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 5d65d2cd204..b55a0cd36a3 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -36,10 +36,6 @@ system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
 CFLAGS="-w -fcommon"
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DWITH_UNIT_TESTS=OFF"
-fi
-
 pre_configure() {
 	# We need some host binaries before starting cross compilation.
 	if [ "$CROSS_BUILD" ]; then