mariadb-galera

3 files changed, 29 insertions, 14 deletions

diff --git a/pcr/galera/PKGBUILD b/pcr/galera/PKGBUILD
index 534e3314c..c7a181b3e 100644
--- a/pcr/galera/PKGBUILD
+++ b/pcr/galera/PKGBUILD
@@ -3,12 +3,12 @@
 
 pkgname=galera
 pkgver=25.3.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Galera WSREP provider'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('boost>=1.41' 'openssl')
-makedepends=('check' 'scons' 'patch')
+depends=('openssl')
+makedepends=('boost>=1.57' 'check' 'scons' 'patch')
 url='http://www.codership.com'
 options=('!libtool')
 source=(https://launchpad.net/galera/3.x/$pkgver/+download/galera-$pkgver-src.tar.gz)
@@ -16,7 +16,8 @@ sha256sums=('9e6d718bac9608c69cbfc0662963b29c13659c576aaa8469b6a325d75603f7a3')
 
 build(){
   cd "$pkgname-$pkgver-src"
-  scons
+  # A deprecation warning makes the build fail
+  scons strict_build_flags=0
 }
 
 package(){
diff --git a/pcr/mariadb-galera/PKGBUILD b/pcr/mariadb-galera/PKGBUILD
index cb6216fa6..a08b8002e 100644
--- a/pcr/mariadb-galera/PKGBUILD
+++ b/pcr/mariadb-galera/PKGBUILD
@@ -4,27 +4,30 @@
 pkgbase=mariadb-galera
 #pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb-galera')
 pkgname='mariadb-galera'
-pkgver=10.0.12
+pkgver=10.0.15
 _pkgver=${pkgver/.a/a}
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='https://mariadb.com/kb/en/galera/'
-makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'libxml2' 'openssl' 'pcre' 'galera')
+makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'libxml2' 'openssl' 'pcre' 'jemalloc' 'galera')
 source=(http://ftp.wa.co.za/pub/mariadb/${pkgbase}-${pkgver}/source/${pkgbase}-${pkgver}.tar.gz
         mariadb.service
         mariadb-post.sh
         mariadb-tmpfile.conf)
-md5sums=('4d142630c565a75d1b1b44246beb2923'
-         'd488fffa9f62f9949c4aa1bb6e6db692'
-         'b79e65a5aa536e6b5bc60988eb0b78a2'
-         '2fa6e456964d4ff5e6d4f9ff0126aed6')
+
+prepare() {
+  sed -i 's/_SVID_SOURCE/_DEFAULT_SOURCE/' \
+    mariadb-$pkgver/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake
+}
 
 build() {
   mkdir -p build
   cd build
 
   cmake ../mariadb-$_pkgver \
+    -DCMAKE_AR=/usr/bin/gcc-ar \
+    -DCMAKE_RANLIB=/usr/bin/gcc-ranlib \
     -DBUILD_CONFIG=mysql_release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DSYSCONFDIR=/etc/mysql \
@@ -48,6 +51,8 @@ build() {
     -DWITH_SSL=system \
     -DWITH_PCRE=system \
     -DWITH_LIBWRAP=OFF \
+    -DWITH_JEMALLOC=ON \
+    -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \
     -DWITH_EXTRA_CHARSETS=complex \
     -DWITH_EMBEDDED_SERVER=ON \
     -DWITH_ARCHIVE_STORAGE_ENGINE=1 \
@@ -58,10 +63,9 @@ build() {
     -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
     -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
     -DWITHOUT_PBXT_STORAGE_ENGINE=1 \
-    -DWITHOUT_TOKUDB=1 \
     -DCMAKE_C_FLAGS="-fPIC $CFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks" \
     -DCMAKE_CXX_FLAGS="-fPIC $CXXFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fno-delete-null-pointer-checks" \
-    -DWITH_MYSQLD_LDFLAGS="$LDFLAGS"
+    -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now"
 
   make
 }
@@ -89,7 +93,7 @@ package_libmariadbclient() {
 
 package_mariadb-clients() {
   pkgdesc='MariaDB client tools'
-  depends=('libmariadbclient' 'zlib' 'openssl')
+  depends=('libmariadbclient' 'zlib' 'openssl' 'jemalloc')
   conflicts=('mysql-clients')
   provides=("mysql-clients=$pkgver")
 
@@ -119,7 +123,8 @@ package_mariadb-galera() {
   pkgdesc='Fast SQL database server, drop-in replacement for MySQL with Galera replication'
   backup=('etc/mysql/my.cnf')
   install=mariadb.install
-  depends=('mariadb-clients' 'inetutils' 'libaio' 'libxml2' 'pcre' 'galera')
+  depends=('mariadb-clients' 'inetutils' 'libaio' 'libxml2' 'pcre' 'galera' 'jemalloc')
+  optdepends=('perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format and mysql_setpermission')
   conflicts=('mysql' 'mariadb')
   provides=("mysql=$pkgver" "mariadb=$pkgver")
   options=('emptydirs')
@@ -150,3 +155,7 @@ package_mariadb-galera() {
   rm -f -r usr/{data,mysql-test,sql-bench}
   rm -f usr/share/man/man1/mysql-test-run.pl.1
 }
+md5sums=('eaf628a5d4edba6a3e84c66403ebdde9'
+         'd488fffa9f62f9949c4aa1bb6e6db692'
+         'b79e65a5aa536e6b5bc60988eb0b78a2'
+         '2fa6e456964d4ff5e6d4f9ff0126aed6')
diff --git a/pcr/mariadb-galera/mariadb.install b/pcr/mariadb-galera/mariadb.install
index 595bc4c4d..68bcc14e4 100644
--- a/pcr/mariadb-galera/mariadb.install
+++ b/pcr/mariadb-galera/mariadb.install
@@ -14,6 +14,11 @@ post_install(){
   fi
 
   usr/bin/systemd-tmpfiles --create mysql.conf
+
+  echo "The cluster needs to be configured before used, please read the
+Getting Started Guide at
+https://mariadb.com/kb/en/mariadb/documentation/replication/galera/getting-started-with-mariadb-galera-cluster/" \
+| fmt -u
 }
 
 post_upgrade(){