[Pkg-mysql-commits] [mariadb-5.5] 01/01: Remove hacky libboost-build-deps, we can live without OQGraph for now. Also remove TokuDB hacks and disable TokuDB, it can be re-added later when it fully builds and works.

Mon Feb 17 08:04:04 UTC 2014

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

ottok-guest pushed a commit to annotated tag disabled-tokudb-oqgraph
in repository mariadb-5.5.

commit 68a065587d7a29006276b3f9bb7188041652c910
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Mon Feb 17 09:34:45 2014 +0200

    Remove hacky libboost-build-deps, we can live without OQGraph for now. Also remove TokuDB hacks and disable TokuDB, it can be re-added later when it fully builds and works.
---
 debian/control                                      |  1 -
 ...er-5.5.install.in => mariadb-server-5.5.install} |  1 -
 .../99_remove_rename_mariadb-server_files_in.diff   | 21 +++++++++++++++++++++
 .../patches/99_rename_mariadb-server_files_in.diff  | 19 -------------------
 debian/patches/series                               |  2 +-
 debian/rules                                        | 14 ++++++--------
 6 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/debian/control b/debian/control
index fa5cecf..aa1a730 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Build-Depends: bison,
                debhelper (>= 9),
                hardening-wrapper,
                libaio-dev[linux-any],
-               libboost1.48-dev | libboost1.49-dev | libboost1.54-dev,
                libncurses5-dev (>= 5.0-6),
                libpam0g-dev,
                libreadline-gplv2-dev,
diff --git a/debian/mariadb-server-5.5.install.in b/debian/mariadb-server-5.5.install
similarity index 99%
rename from debian/mariadb-server-5.5.install.in
rename to debian/mariadb-server-5.5.install
index e157e67..80aa8dd 100644
--- a/debian/mariadb-server-5.5.install.in
+++ b/debian/mariadb-server-5.5.install
@@ -69,4 +69,3 @@ usr/share/mysql/mysql_system_tables_data.sql
 usr/share/mysql/mysql_system_tables.sql
 usr/share/mysql/mysql_performance_tables.sql
 usr/share/mysql/mysql_test_data_timezone.sql
- at TOKUDB_DEB_FILES@
diff --git a/debian/patches/99_remove_rename_mariadb-server_files_in.diff b/debian/patches/99_remove_rename_mariadb-server_files_in.diff
new file mode 100755
index 0000000..05107c0
--- /dev/null
+++ b/debian/patches/99_remove_rename_mariadb-server_files_in.diff
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99_remove_rename_mariadb-server_files_in <otto at seravo.fi>
+##
+
+ at DPATCH@
+=== modified file 'CMakeLists.txt'
+--- old/CMakeLists.txt	2014-01-29 20:55:56.499842093 +0200
++++ new/CMakeLists.txt	2014-01-31 17:12:27.633594128 +0200
+@@ -431,12 +431,6 @@
+ CONFIGURE_FILE(
+     ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
+ 
+-IF(DEB)
+-  CONFIGURE_FILE(
+-    ${CMAKE_SOURCE_DIR}/debian/mariadb-server-5.5.files.in
+-    ${CMAKE_SOURCE_DIR}/debian/mariadb-server-5.5.files)
+-ENDIF(DEB)
+-
+ # Handle the "INFO_*" files.
+ INCLUDE(${CMAKE_BINARY_DIR}/info_macros.cmake)
+ # Source: This can be done during the cmake phase, all information is
diff --git a/debian/patches/99_rename_mariadb-server_files_in.diff b/debian/patches/99_rename_mariadb-server_files_in.diff
deleted file mode 100755
index 1836c5a..0000000
--- a/debian/patches/99_rename_mariadb-server_files_in.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99_rename_mariadb-server_files_in <otto at seravo.fi>
-##
-
- at DPATCH@
-=== modified file 'CMakeLists.txt'
---- old/CMakeLists.txt	2014-01-29 20:55:56.499842093 +0200
-+++ new/CMakeLists.txt	2014-01-31 17:12:27.633594128 +0200
-@@ -433,8 +433,8 @@
- 
- IF(DEB)
-   CONFIGURE_FILE(
--    ${CMAKE_SOURCE_DIR}/debian/mariadb-server-5.5.files.in
--    ${CMAKE_SOURCE_DIR}/debian/mariadb-server-5.5.files)
-+    ${CMAKE_SOURCE_DIR}/debian/mariadb-server-5.5.install.in
-+    ${CMAKE_SOURCE_DIR}/debian/mariadb-server-5.5.install)
- ENDIF(DEB)
- 
- # Handle the "INFO_*" files.
diff --git a/debian/patches/series b/debian/patches/series
index dbfe3c2..ad73139 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,4 @@
 80_skip_socket_test_if_user_undefined.diff
 81_clean_up_also_backup_files.diff
 82_extend_default_test_timeout_for_tokudb.diff
-99_rename_mariadb-server_files_in.diff
+99_remove_rename_mariadb-server_files_in.diff
diff --git a/debian/rules b/debian/rules
index 577485a..0e4af5f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,12 @@ 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
@@ -101,14 +107,6 @@ configure-stamp:
 	    -DINSTALL_PLUGINDIR=lib/mysql/plugin \
 	    -DINSTALL_SUPPORTFILESDIR=share/mysql \
 		-DDEB=1 ..'
-	@echo "Debug: DISTRIBUTION=$(DISTRIBUTION)"
-ifeq ($(DISTRIBUTION),Ubuntu)
-	@echo "Debug: RELEASE=$(RELEASE)"
-ifeq ($(RELEASE),14.04)
-	sed -i '/ha_oqgraph.so/d' debian/mariadb-server-5.5.install.in
-	@echo "Debug: ha_oqgraph.so removed from 'mariadb-server-5.5.install.in'"
-endif
-endif
 	touch $@
 
 override_dh_auto_build: build-stamp

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

