git » mariadb.git » commit 7a92cc2

switch to build type recommended by upstream

author Bartłomiej Piotrowski
2013-12-03 07:22:32 UTC
committer Bartłomiej Piotrowski
2013-12-03 07:22:32 UTC
parent e34288301fe7a9f58b33bb2ec6f27e8a16bf8a77

switch to build type recommended by upstream

PKGBUILD +5 -11

diff --git a/PKGBUILD b/PKGBUILD
index 0853550..6a6f210 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,11 +4,11 @@ pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
 pkgver=5.5.34
 _pkgver=${pkgver/.a/a}
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('GPL')
 url='http://mariadb.org/'
-makedepends=('cmake' 'openssl' 'zlib')
+makedepends=('cmake' 'openssl' 'zlib' 'libaio')
 source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$_pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$_pkgver.tar.gz
         mariadb.service
         mariadb-post.sh
@@ -18,18 +18,12 @@ sha256sums=('a4d8b54be0f5784924629a1e87dbbccc4c0aaf537c76951e265625deda322f89'
             '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
             '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd')
 
-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() {
   mkdir build
   cd build
 
   cmake ../$pkgbase-$_pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_CONFIG=mysql_release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DSYSCONFDIR=/etc/mysql \
     -DMYSQL_DATADIR=/var/lib/mysql \
@@ -71,7 +65,7 @@ build() {
 
 package_libmariadbclient() {
   pkgdesc='MariaDB client libraries'
-  depends=('openssl')
+  depends=('openssl' 'libaio')
   conflicts=('libmysqlclient')
   provides=("libmysqlclient=$pkgver")
   options=('staticlibs')
@@ -120,7 +114,7 @@ package_mariadb() {
   pkgdesc='Fast SQL database server, drop-in replacement for MySQL'
   backup=('etc/mysql/my.cnf')
   install=mariadb.install
-  depends=('mariadb-clients' 'inetutils')
+  depends=('mariadb-clients' 'inetutils' 'libaio')
   conflicts=('mysql')
   provides=("mysql=$pkgver")
   options=('emptydirs')