[arch-commits] Commit in mariadb/trunk (PKGBUILD)

[Bartłomiej Piotrowski]

    Date: Sunday, December 1, 2013 @ 13:23:11
  Author: bpiotrowski
Revision: 200662

upgpkg: mariadb 5.5.34-2

- re-enable TokuDB engine
- keep static libraries in libmariadbclient

Modified:
  mariadb/trunk/PKGBUILD

----------+
 PKGBUILD |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-01 10:17:21 UTC (rev 200661)
+++ PKGBUILD	2013-12-01 12:23:11 UTC (rev 200662)
@@ -5,7 +5,7 @@
 pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
 pkgver=5.5.34
 _pkgver=${pkgver/.a/a}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url='http://mariadb.org/'
@@ -22,6 +22,7 @@
 prepare() {
   cd $pkgbase-$_pkgver
   sed -i '63d' storage/tokudb/ft-index/cmake_modules/TokuSetupCTest.cmake
+  sed -i '176,177s/-Werror//' storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake
 }
 
 build() {
@@ -57,7 +58,7 @@
     -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
     -DWITH_INNOBASE_STORAGE_ENGINE=1 \
     -DWITH_PARTITION_STORAGE_ENGINE=1 \
-    -DWITHOUT_TOKUDB_STORAGE_ENGINE=1 \
+    -DWITH_TOKUDB_STORAGE_ENGINE=1 \
     -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
     -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
     -DWITHOUT_PBXT_STORAGE_ENGINE=1 \
@@ -74,6 +75,7 @@
   depends=('openssl')
   conflicts=('libmysqlclient')
   provides=("libmysqlclient=$pkgver")
+  options=('staticlibs')
   
   cd build
   for dir in include libmysql libmysqld libservices; do