From 9e4f70c827434d8a2b8eee88ff03ab5e0c545e15 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Tue, 12 Jun 2018 01:22:50 +0200 Subject: [PATCH] Jemalloc dependency moved to the TokuDB subpackage CMake jemalloc option removed, not used anymore The server doesn't need jemalloc since 10.2: https://jira.mariadb.org/browse/MDEV-11059 Build MariaDB with TokuDB without Jemalloc; users didn't find it problematic --- mariadb.spec | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/mariadb.spec b/mariadb.spec index a5a4fe2..631b817 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -22,9 +22,9 @@ # https://mariadb.com/kb/en/mariadb/tokudb/ # TokuDB engine is available only for x86_64 # * There's a problem currently with jemalloc, which tokudb use. -# TokuDB does not yet support new Jemalloc 5, but on F>=28, there's only Jemalloc 5. Not a supported configuration. -# * Disabling build of TokuDB with Jemalloc 5 since it doesn't work. https://jira.percona.com/browse/PS-4393 +# TokuDB does not yet support new Jemalloc 5, but on F>=28, there's only Jemalloc 5. Not a supported configuration. https://jira.percona.com/browse/PS-4393 # Also build of TokuDB without Jemalloc is not supported. +# * It is better to build TokuDB without jemalloc than not at all. So far, this configuration works for users and they want the TokuDB. # Mroonga engine # https://mariadb.com/kb/en/mariadb/about-mroonga/ # Current version in MariaDB, 7.07, only supports the x86_64 @@ -32,12 +32,9 @@ # RocksDB engine # https://mariadb.com/kb/en/library/myrocks-supported-platforms/ # RocksB engine is available only for x86_64 +# RocksDB may be built with jemalloc, if specified in CMake %if %_arch == x86_64 && 0%{?fedora} -%if 0%{?fedora} >= 28 || 0%{?rhel} > 7 -%bcond_with tokudb -%else %bcond_without tokudb -%endif %bcond_without mroonga %bcond_without rocksdb %else @@ -203,9 +200,6 @@ BuildRequires: systemd systemd-devel BuildRequires: zlib-devel %{?with_lz4:BuildRequires: lz4-devel} -# TokuDB and some core stuff -BuildRequires: jemalloc-devel - # asynchornous operations stuff BuildRequires: libaio-devel # commands history features @@ -505,6 +499,7 @@ The RocksDB storage engine is used for high performance servers on SSD drives. %package tokudb-engine Summary: The TokuDB storage engine for MariaDB Requires: %{name}-server%{?_isa} = %{sameevr} +BuildRequires: jemalloc-devel Requires: jemalloc %description tokudb-engine @@ -834,7 +829,6 @@ export CFLAGS CXXFLAGS -DCONC_WITH_SSL=%{?with_clibrary:ON}%{!?with_clibrary:NO} \ -DWITH_SSL=system \ -DWITH_ZLIB=system \ - -DWITH_JEMALLOC=yes \ -DLZ4_LIBS=%{_libdir}/liblz4.so \ -DWITH_INNODB_LZ4=%{?with_lz4:ON}%{!?with_lz4:OFF} \ -DPLUGIN_MROONGA=%{?with_mroonga:DYNAMIC}%{!?with_mroonga:NO} \ @@ -1577,6 +1571,10 @@ fi %changelog * Tue Jun 05 2018 Honza Horak - 3:10.2.15-2 - Use mysqladmin for checking the socket +- Jemalloc dependency moved to the TokuDB subpackage. + CMake jemalloc option removed, not used anymore. + The server doesn't need jemalloc since 10.2: https://jira.mariadb.org/browse/MDEV-11059 +- Build MariaDB with TokuDB without Jemalloc. * Wed May 23 2018 Michal Schorm - 3:10.2.15-1 - Rebase to 10.2.15