[mariadb/f18] Dont't build with TokuDB by default

Honza Horak hhorak at fedoraproject.org
Mon Oct 14 11:45:47 UTC 2013


commit af136ba00562ce4c17f356b52645bdc020af86c4
Author: Honza Horak <horak.honza at gmail.com>
Date:   Sat Oct 12 15:53:31 2013 +0200

    Dont't build with TokuDB by default
    
    Conflicts:
    	mariadb.spec

 mariadb.spec |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/mariadb.spec b/mariadb.spec
index 579e39a..fb310f8 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -1,3 +1,7 @@
+# TokuDB engine is now part of MariaDB, but it is available only for x86_64;
+# variable tokudb allows to build with TokuDB storage engine
+%bcond_with tokudb
+
 Name: mariadb
 Version: 5.5.33a
 Release: 1%{?dist}
@@ -12,7 +16,7 @@ URL: http://mariadb.org
 License: GPLv2 with exceptions and LGPLv2 and BSD
 
 # Regression tests take a long time, you can skip 'em with this
-%{!?runselftest:%global runselftest 1}
+%{!?runselftest:%global runselftest 0}
 
 Source0: http://ftp.osuosl.org/pub/mariadb/mariadb-%{version}/kvm-tarbake-jaunty-x86/mariadb-%{version}.tar.gz
 Source3: my.cnf
@@ -324,6 +328,7 @@ cmake . -DBUILD_CONFIG=mysql_release \
 	-DWITH_SSL=system \
 	-DWITH_ZLIB=system \
 	-DWITH_JEMALLOC=no \
+%{!?with_tokudb:	-DWITHOUT_TOKUDB=ON}\
 	-DTMPDIR=%{_localstatedir}/tmp \
 	-DWITH_MYSQLD_LDFLAGS="-Wl,-z,relro,-z,now"
 
@@ -569,7 +574,7 @@ fi
 %{_bindir}/mysqlbinlog
 %{_bindir}/mysqlcheck
 %{_bindir}/mysqldump
-%{_bindir}/tokuftdump
+%{?with_tokudb:%{_bindir}/tokuftdump}
 %{_bindir}/mysqlimport
 %{_bindir}/mysqlshow
 %{_bindir}/mysqlslap
@@ -663,7 +668,7 @@ fi
 %{_bindir}/resolveip
 
 %config(noreplace) %{_sysconfdir}/my.cnf.d/server.cnf
-%config(noreplace) %{_sysconfdir}/my.cnf.d/tokudb.cnf
+%{?with_tokudb:%config(noreplace) %{_sysconfdir}/my.cnf.d/tokudb.cnf}
 
 %{_libexecdir}/mysqld
 


More information about the scm-commits mailing list