git » mariadb.git » commit e342883

re-enable TokuDB engine

author Bartłomiej Piotrowski
2013-12-01 12:23:11 UTC
committer Bartłomiej Piotrowski
2013-12-01 12:23:11 UTC
parent abeaa5fc545ce427c45c0a04ff829ebf71f403cc

re-enable TokuDB engine

- keep static libraries in libmariadbclient

PKGBUILD +4 -2

diff --git a/PKGBUILD b/PKGBUILD
index 255f2bb..0853550 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgbase=mariadb
 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/'
@@ -21,6 +21,7 @@ sha256sums=('a4d8b54be0f5784924629a1e87dbbccc4c0aaf537c76951e265625deda322f89'
 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() {
@@ -56,7 +57,7 @@ build() {
     -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 \
@@ -73,6 +74,7 @@ package_libmariadbclient() {
   depends=('openssl')
   conflicts=('libmysqlclient')
   provides=("libmysqlclient=$pkgver")
+  options=('staticlibs')
   
   cd build
   for dir in include libmysql libmysqld libservices; do