[Pkg-mysql-commits] [mariadb-5.5] 02/08: Re-enabled TokuDB with "if arch amd64" in d/rules

[Otto Kekäläinen]

This is an automated email from the git hooks/post-receive script.

ottok-guest pushed a commit to branch master
in repository mariadb-5.5.

commit 7f918223f7bd31e82b72e4cf6758719027358073
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Thu Apr 17 19:38:50 2014 +0300

    Re-enabled TokuDB with "if arch amd64" in d/rules
---
 debian/changelog |  1 +
 debian/rules     | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cbce6b7..231076e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 mariadb-5.5 (5.5.36-2) unstable; urgency=low
 
+  * Re-enabled TokuDB with "if arch amd64" in d/rules
   * Applied patch to log init output better
     (Closes https://mariadb.atlassian.net/browse/MDEV-5957)
 
diff --git a/debian/rules b/debian/rules
index d8920bc..dd1c638 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,11 @@ ifneq (,$(filter $(ARCH), i386 kfreebsd-i386 hurd-i386))
     TAOCRYPT_OPT="-DTAOCRYPT_DISABLE_X86ASM"
 endif
 
+# Skip TokuDB if arch is not amd64
+ifneq ($(findstring amd64,$(ARCH)),)
+    TOKUDB_OPT="-DWITHOUT_TOKUDB=true"
+endif
+
 export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc
 export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++
 
@@ -95,8 +100,7 @@ configure-stamp:
 		$(USE_STATIC_MYSQLD) \
 	    -DCOMPILATION_COMMENT="($(DISTRIBUTION))" \
 	    -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
-	    -DSYSTEM_TYPE="debian-$(DEB_BUILD_GNU_SYSTEM)" \
-	    -DWITHOUT_TOKUDB=true \
+	    -DSYSTEM_TYPE="debian-$(DEB_BUILD_GNU_SYSTEM)" $(TOKUDB_OPT) \
 	    -DBUILD_CONFIG=mysql_release \
 	    -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
 	    -DINSTALL_PLUGINDIR=lib/mysql/plugin \
@@ -131,6 +135,10 @@ auto_install-stamp:
 	dh_testdir
 	dh_testroot
 	
+	# If TokuDB plugin was built
+	# add it to the server install list.
+	[ ! -f $(BUILDDIR)/usr/lib/mysql/plugin/ha_tokudb.so ] || echo 'usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump\nusr/share/doc/mariadb-server-5.5/README-TOKUDB\nusr/share/doc/mariadb-server-5.5/README.md' >> debian/mariadb-server-5.5.install
+	
 	# some self written manpages which hopefully
 	# gets overwritten sooner or later with upstreams
 	mkdir -p $(TMP)/usr/share/man/man1/

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git