From e38c88989de563a7d271710c5a224b7c0a784c76 Mon Sep 17 00:00:00 2001 From: Randy McCaskill Date: Wed, 27 May 2020 02:22:24 -0400 Subject: [PATCH] mariadb: update to 10.1.45. --- .../mariadb/patches/fix-pthread-detach.patch | 34 ------------------- .../mariadb/patches/force-c11-atomics.patch | 2 +- srcpkgs/mariadb/patches/musl-ppc.patch | 11 +++--- srcpkgs/mariadb/template | 6 ++-- 4 files changed, 9 insertions(+), 44 deletions(-) delete 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 deleted file mode 100644 index a53c05b1320..00000000000 --- a/srcpkgs/mariadb/patches/fix-pthread-detach.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c45b4a774b6d1404a080a1c1759f780fa78f223b Mon Sep 17 00:00:00 2001 -From: Sergey Vojtovich -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/patches/force-c11-atomics.patch b/srcpkgs/mariadb/patches/force-c11-atomics.patch index 9546798bf97..4109baa3dec 100644 --- a/srcpkgs/mariadb/patches/force-c11-atomics.patch +++ b/srcpkgs/mariadb/patches/force-c11-atomics.patch @@ -222,7 +222,7 @@ #define MY_ATOMIC_NOT_1CPU 1 extern int my_atomic_initialize(); --#ifdef __ATOMIC_SEQ_CST +-#ifdef HAVE_GCC_C11_ATOMICS +#define MY_ATOMIC_MODE "gcc-atomics-smp" + #define MY_MEMORY_ORDER_RELAXED __ATOMIC_RELAXED diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch index 16cbac71a94..57c7f4bf15b 100644 --- a/srcpkgs/mariadb/patches/musl-ppc.patch +++ b/srcpkgs/mariadb/patches/musl-ppc.patch @@ -15,12 +15,11 @@ builtin for this in gcc for ages, so just use that instead. # endif --- storage/xtradb/include/ut0ut.h +++ storage/xtradb/include/ut0ut.h -@@ -86,8 +86,7 @@ struct ut_when_dtor { - independent way by using YieldProcessor. */ - # define UT_RELAX_CPU() YieldProcessor() - # elif defined(__powerpc__) --#include --# define UT_RELAX_CPU() __ppc_get_timebase() +@@ -86,6 +86,8 @@ + # elif defined(__powerpc__) && defined __GLIBC__ + #include + # define UT_RELAX_CPU() __ppc_get_timebase() ++# elif defined(__powerpc__) +# define UT_RELAX_CPU() __builtin_ppc_get_timebase() # else # define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */ diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template index 88611438a99..cfdd2717fc5 100644 --- a/srcpkgs/mariadb/template +++ b/srcpkgs/mariadb/template @@ -1,7 +1,7 @@ # Template file for 'mariadb' pkgname=mariadb -version=10.1.30 -revision=8 +version=10.1.45 +revision=1 build_style=cmake configure_args="-DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8 @@ -27,7 +27,7 @@ maintainer="Orphaned " license="GPL-2.0-only" homepage="https://mariadb.org/" distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz" -checksum=173a5e5a24819e0a469c3bd09b5c98491676c37c6095882a2ea34c5af0996c88 +checksum=9d8f0f71f9613b2028ffc5c5be8b98948ec955eb0d89600d18ed7cc04807dad5 lib32disabled=yes provides="mysql-${version}_${revision}" replaces="mysql>=0"