[PR PATCH] mariadb: add a patch to fix an issue on musl.

[PR PATCH] mariadb: add a patch to fix an issue on musl.

[CMB]

[-- Attachment #1: Type: text/plain, Size: 392 bytes --]

There is a new pull request by CMB against master on the void-packages repository

https://github.com/CMB/void-packages mariadb-musl
https://github.com/void-linux/void-packages/pull/21561

mariadb: add a patch to fix an issue on musl.
Sourced from: https://github.com/MariaDB/server/commit/1655053ac1

A patch file from https://github.com/void-linux/void-packages/pull/21561.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-musl-21561.patch --]
[-- Type: text/x-diff, Size: 2719 bytes --]

From 2b4fb55ea3dd74b2edae35c5af413309afe42f33 Mon Sep 17 00:00:00 2001
From: Christopher Brannon <chris@the-brannons.com>
Date: Sat, 2 May 2020 07:31:16 -0700
Subject: [PATCH] mariadb: add a patch to fix an issue on musl.

Sourced from: https://github.com/MariaDB/server/commit/1655053ac1
---
 .../mariadb/patches/fix-pthread-detach.patch  | 34 +++++++++++++++++++
 srcpkgs/mariadb/template                      |  2 +-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mariadb/patches/fix-pthread-detach.patch

diff --git a/srcpkgs/mariadb/patches/fix-pthread-detach.patch b/srcpkgs/mariadb/patches/fix-pthread-detach.patch
new file mode 100644
index 00000000000..a53c05b1320
--- /dev/null
+++ b/srcpkgs/mariadb/patches/fix-pthread-detach.patch
@@ -0,0 +1,34 @@
+From c45b4a774b6d1404a080a1c1759f780fa78f223b Mon Sep 17 00:00:00 2001
+From: Sergey Vojtovich <svoj@mariadb.org>
+Date: Fri, 21 Sep 2018 16:04:16 +0400
+Subject: [PATCH] MDEV-17200 - pthread_detach called for already detached
+ threads
+
+pthread_detach_this_thread() was intended to be defined to something
+meaningful only on some ancient unixes, which don't have
+pthread_attr_setdetachstate() defined. Otherwise, on normal unixes,
+threads are created detached in the first place.
+
+This was broken in 0f01bf267680244ec488adaf65a42838756ed48e so that
+we started calling pthread_detach() for already detached threads.
+Intention was to detach aria checkpoint thread.
+
+However in 87007dc2f71634cc460271eb277ad851ec69c04b aria service threads
+were made joinable with appropriate handling, which makes breaking
+revision unneccessary.
+
+Revert remnants of 0f01bf267680244ec488adaf65a42838756ed48e, so that
+pthread_detach_this_thread() is meaningful only on some ancient unixes
+again.
+
+--- include/my_pthread.h
++++ include/my_pthread.h
+@@ -184,7 +184,7 @@ int pthread_cancel(pthread_t thread);
+ #define pthread_key(T,V) pthread_key_t V
+ #define my_pthread_getspecific_ptr(T,V) my_pthread_getspecific(T,(V))
+ #define my_pthread_setspecific_ptr(T,V) pthread_setspecific(T,(void*) (V))
+-#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(tmp); }
++#define pthread_detach_this_thread()
+ #define pthread_handler_t EXTERNC void *
+ typedef void *(* pthread_handler)(void *);
+ 
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index c0c44217b71..157024b9652 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.1.30
-revision=7
+revision=8
 build_style=cmake
 configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8

Re: mariadb: add a patch to fix an issue on musl.

[jnbr]

[-- Attachment #1: Type: text/plain, Size: 331 bytes --]

New comment by jnbr on void-packages repository

https://github.com/void-linux/void-packages/pull/21561#issuecomment-629470146

Comment:
Travis-CI failed to build the package, some timed out, some actually failed.
There isn't much we can do on timeouts, but can you check locally if it works and see why cross builds are failing?

Re: mariadb: add a patch to fix an issue on musl.

[CMB]

[-- Attachment #1: Type: text/plain, Size: 584 bytes --]

New comment by CMB on void-packages repository

https://github.com/void-linux/void-packages/pull/21561#issuecomment-629731019

Comment:
> There isn't much we can do on timeouts, but can you check locally if it works
> and see why cross builds are failing?

I'm seeing the same failures locally when cross-building for ARM.
The build log wasn't too helpful, so I tried building the current
version of the package that is in Void's repos: mariadb-10.1.30_7.  That
build also failed for ARM.  So it's not a failure introduced by the
patch.

I can keep trying to track down the problem.

Re: mariadb: add a patch to fix an issue on musl.

[jnbr]

[-- Attachment #1: Type: text/plain, Size: 356 bytes --]

New comment by jnbr on void-packages repository

https://github.com/void-linux/void-packages/pull/21561#issuecomment-629765121

Comment:
Yes, please do. Merging something that fails to build isn't an option, even if the change is unrelated to the failure.
Maybe adding `disable_parallel_build=yes` tp the template helps, it was needed before for mariadb.

Re: mariadb: add a patch to fix an issue on musl.

[newbluemoon]

[-- Attachment #1: Type: text/plain, Size: 1419 bytes --]

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/21561#issuecomment-629774844

Comment:
It seems that the host-built tools to generate some header files are not found.
By moving them into the `build` directory they’re magically found again.
With following changes a cross-build was successful:
```
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index c0c44217b7..b87e35e49e 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -53,11 +53,11 @@ pre_configure() {

 pre_build() {
        if [ "$CROSS_BUILD" ]; then
-               cp bin.host/comp_err ${wrksrc}/extra
-               cp bin.host/comp_sql ${wrksrc}/scripts
-               cp bin.host/gen_lex_hash ${wrksrc}/sql
-               cp bin.host/gen_lex_token ${wrksrc}/sql
-               export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
+               cp bin.host/comp_err ${wrksrc}/build/extra
+               cp bin.host/comp_sql ${wrksrc}/build/scripts
+               cp bin.host/gen_lex_hash ${wrksrc}/build/sql
+               cp bin.host/gen_lex_token ${wrksrc}/build/sql
+               export PATH=${PATH}:${wrksrc}/build/extra:${wrksrc}/build/scripts:${wrksrc}/build/sql
        fi
        export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
        case "$XBPS_TARGET_MACHINE" in
```

Re: [PR PATCH] [Closed]: mariadb: add a patch to fix an issue on musl.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 244 bytes --]

There's a closed pull request on the void-packages repository

mariadb: add a patch to fix an issue on musl.
https://github.com/void-linux/void-packages/pull/21561

Description:
Sourced from: https://github.com/MariaDB/server/commit/1655053ac1