git » mariadb.git » commit c4f754f

upgpkg: 10.0.12-2

author Bartłomiej Piotrowski
2014-07-26 08:41:31 UTC
committer Bartłomiej Piotrowski
2014-07-26 08:41:31 UTC
parent 0c258c341a2b5a073f136860515e4d740aab26b2
upgpkg: 10.0.12-2

- re-enable TokuDB once again. Thank you Leif Walsh and Rich Prohaska for the fix.
- add perl-dbd-mysql to mariadb's optdepends, as some scripts require it (FS#41148)
PKGBUILD +4 -2 
diff --git a/PKGBUILD b/PKGBUILD
index 8e14ea0..d66fb7c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
 pkgver=10.0.12
 _pkgver=${pkgver/.a/a}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url='http://mariadb.org/'
@@ -23,6 +23,8 @@ build() {
   cd build
 
   cmake ../$pkgbase-$_pkgver \
+    -DCMAKE_AR=/usr/bin/gcc-ar \
+    -DCMAKE_RANLIB=/usr/bin/gcc-ranlib \
     -DBUILD_CONFIG=mysql_release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DSYSCONFDIR=/etc/mysql \
@@ -56,7 +58,6 @@ 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"
@@ -118,6 +119,7 @@ package_mariadb() {
   backup=('etc/mysql/my.cnf')
   install=mariadb.install
   depends=('mariadb-clients' 'inetutils' 'libaio' 'libxml2' 'pcre')
+  optdepends=('perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format and mysql_setpermission')
   conflicts=('mysql')
   provides=("mysql=$pkgver")
   options=('emptydirs')