mariadb: fix armv*-musl builds.

This commit is contained in:
Steve Prybylski 2016-07-22 19:04:35 -04:00
parent 7b481b8f5c
commit ef47370dff
2 changed files with 19 additions and 6 deletions

View File

@ -0,0 +1,18 @@
--- ./sql/signal_handler.cc.orig 2016-07-22 18:19:35.495952401 -0400
+++ ./sql/signal_handler.cc 2016-07-22 18:20:57.613943892 -0400
@@ -276,6 +276,7 @@
"\"mlockall\" bugs.\n");
}
+#ifdef HAVE_STACKTRACE
if (print_invalid_query_pointer)
{
my_safe_printf_stderr(
@@ -285,6 +286,7 @@
my_write_stderr(thd->query(), MY_MIN(65536U, thd->query_length()));
my_safe_printf_stderr("\n\n");
}
+#endif
#ifdef HAVE_WRITE_CORE
if (test_flags & TEST_CORE_ON_SIGNAL)

View File

@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.1.16
revision=1
revision=2
build_style=cmake
configure_args="-DMYSQL_DATADIR=/var/lib/mysql
-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@ -34,11 +34,6 @@ distfiles="https://downloads.$pkgname.org/f/$pkgname-$version/source/$pkgname-$v
checksum=67cb35c62cc5d4cf48d7b614c0c7a9245a762ca23d4e588e15c616c102e64393
CFLAGS="-w"
case "$XBPS_TARGET_MACHINE" in
armv*-musl)
broken="https://build.voidlinux.eu/builders/armv6l-musl_builder/builds/12376/steps/shell_3/logs/stdio" ;;
esac
case "$XBPS_TARGET_MACHINE" in
armv*)
configure_args+=" -DHAVE_FALLOC_PUNCH_HOLE_AND_KEEP_SIZE_EXITCODE=0" ;;