extra/mariadb: fix

extra/mariadb/PKGBUILD

@@ -4,6 +4,7 @@
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - disable mroonga storage engine (doesn't build on ARM)
+#  - patch to link (unused) static libs against libatomic on v5/v6 to fix FTBFS
 
 pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
@@ -17,11 +18,13 @@ makedepends=('cmake' 'zlib' 'libaio' 'libxml2' 'openssl' 'pcre' 'jemalloc'
 validpgpkeys=('199369E5404BD5FC7D2FE43BCBCB082A1BB943DB') # MariaDB Package Signing Key <package-signing-key@mariadb.org>
 source=("https://ftp.heanet.ie/mirrors/mariadb/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz"{,.asc}
         '0001-openssl-1-1-0.patch'
+        'atomic.patch'
         'mariadb-sysusers.conf'
         'mariadb-tmpfile.conf')
 sha256sums=('b3df99ae5b1ec8cf6cede4cbc4ae3f54ce66464549cba6d56d9ff4d24e4d551e'
             'SKIP'
             '41d80d3ff78251bd3e05ed5c40b63e4ac71153832a00c86443be5a111daad354'
+            '2ddfe7dc5eae905ed77d7438d6869f9bb26684945c2f82cc19f84926b1cb849f'
             'e1a22777c65854041f16fc0a2db3218d17b4d7e7ec7ab7a77cf49c71277c1515'
             '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd')
 
@@ -37,6 +40,10 @@ prepare() {
 
   # openssl 1.1.0
   patch -Np1 < "${srcdir}"/0001-openssl-1-1-0.patch
+
+  if [[ $CARCH == arm || $CARCH == armv6h ]]; then
+    patch -p0 -i ../atomic.patch
+  fi
 }
 
 build() {

extra/mariadb/atomic.patch

@@ -0,0 +1,22 @@
+--- libmysqld/CMakeLists.txt.orig	2017-06-02 07:40:08.506002423 -0600
++++ libmysqld/CMakeLists.txt	2017-06-02 07:40:21.575972304 -0600
+@@ -137,6 +137,7 @@
+   ${LIBWRAP} ${LIBCRYPT} ${LIBDL}
+   ${MYSQLD_STATIC_PLUGIN_LIBS}
+   sql_embedded
++  atomic
+ )
+ 
+ # Some storage engine were compiled for embedded specifically
+--- sql/CMakeLists.txt.orig	2017-06-02 17:52:45.041823696 -0600
++++ sql/CMakeLists.txt	2017-06-02 17:52:25.446874245 -0600
+@@ -176,7 +176,8 @@
+   ${LIBWRAP} ${LIBCRYPT} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT}
+   ${WSREP_LIB}
+   ${SSL_LIBRARIES}
+-  ${LIBSYSTEMD})
++  ${LIBSYSTEMD}
++  atomic)
+ 
+ IF(WIN32)
+   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)