[Pkg-mysql-commits] [mariadb-5.5] 01/01: Disable TokuDB build correctly in CMake options

[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 1ea10575e535f6c862f658dea3b97d906760d6f6
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Mon Feb 17 12:28:18 2014 +0200

    Disable TokuDB build correctly in CMake options
---
 debian/rules | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/rules b/debian/rules
index 0e4af5f..71a17dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,12 +29,6 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DISTRIBUTION := $(shell lsb_release -i -s)
 RELEASE := $(shell lsb_release -r -s)
 
-# Disable TokuDB 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
-export WITHOUT_TOKUDB=true
-
 MAKE_TEST_TARGET:=test-force
 ifneq ($(findstring fulltest,$(DEB_BUILD_OPTIONS)),)
 # make test-bt is the testsuite run by the MySQL build team
@@ -102,6 +96,7 @@ configure-stamp:
 	    -DCOMPILATION_COMMENT="($(DISTRIBUTION))" \
 	    -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
 	    -DSYSTEM_TYPE="debian-$(DEB_BUILD_GNU_SYSTEM)" \
+	    -DWITHOUT_TOKUDB=true \
 	    -DBUILD_CONFIG=mysql_release \
 	    -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
 	    -DINSTALL_PLUGINDIR=lib/mysql/plugin \
@@ -109,6 +104,13 @@ 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