[Pkg-mysql-commits] [mariadb-5.5] 01/01: Bugfix 'if not amd64 disable TokuDB' 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 5a830d7ff8506084fa64535ce6449f197e83bfa1
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Fri Apr 18 08:07:40 2014 +0300

    Bugfix 'if not amd64 disable TokuDB' in d/rules
---
 debian/rules | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index dd1c638..aa74895 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ ifneq (,$(filter $(ARCH), i386 kfreebsd-i386 hurd-i386))
 endif
 
 # Skip TokuDB if arch is not amd64
-ifneq ($(findstring amd64,$(ARCH)),)
+ifneq ($(ARCH), amd64)
     TOKUDB_OPT="-DWITHOUT_TOKUDB=true"
 endif
 
@@ -108,13 +108,6 @@ configure-stamp:
 		-DDEB=1 ..'
 	touch $@
 
-# Disable TokuDB above due to
-# * i386 does not work and CMakeLists.txt check for processor does not detect
-#   correct ARCH in chroot
-# * Build errors in Trusty: https://mariadb.atlassian.net/browse/MDEV-5618
-# * There was ugly code in CMakeLists.txt that touched stuff in debian/*
-#   that needs to be re-written
-
 override_dh_auto_build: build-stamp
 
 build-stamp:

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