Prepare for building experimental Cassandra storage engine; leave it disabled for now
Remove openssl and bison unused requires Disable building with jemalloc by CMake option; it was previously removed by accident
This commit is contained in:
parent
9e4f70c827
commit
68d53d0cd5
29
mariadb.spec
29
mariadb.spec
@ -33,14 +33,20 @@
|
|||||||
# https://mariadb.com/kb/en/library/myrocks-supported-platforms/
|
# https://mariadb.com/kb/en/library/myrocks-supported-platforms/
|
||||||
# RocksB engine is available only for x86_64
|
# RocksB engine is available only for x86_64
|
||||||
# RocksDB may be built with jemalloc, if specified in CMake
|
# RocksDB may be built with jemalloc, if specified in CMake
|
||||||
|
# Cassandra engine
|
||||||
|
# Experimental version of the Cassandra storage engine
|
||||||
|
# The tests needs running cassandra server
|
||||||
|
# Do not build it for now
|
||||||
%if %_arch == x86_64 && 0%{?fedora}
|
%if %_arch == x86_64 && 0%{?fedora}
|
||||||
%bcond_without tokudb
|
%bcond_without tokudb
|
||||||
%bcond_without mroonga
|
%bcond_without mroonga
|
||||||
%bcond_without rocksdb
|
%bcond_without rocksdb
|
||||||
|
%bcond_with cassandra
|
||||||
%else
|
%else
|
||||||
%bcond_with tokudb
|
%bcond_with tokudb
|
||||||
%bcond_with mroonga
|
%bcond_with mroonga
|
||||||
%bcond_with rocksdb
|
%bcond_with rocksdb
|
||||||
|
%bcond_with cassandra
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# The Open Query GRAPH engine (OQGRAPH) is a computation engine allowing
|
# The Open Query GRAPH engine (OQGRAPH) is a computation engine allowing
|
||||||
@ -241,7 +247,6 @@ BuildRequires: perl(Time::HiRes)
|
|||||||
BuildRequires: perl(Symbol)
|
BuildRequires: perl(Symbol)
|
||||||
# for running some openssl tests rhbz#1189180
|
# for running some openssl tests rhbz#1189180
|
||||||
BuildRequires: openssl openssl-devel
|
BuildRequires: openssl openssl-devel
|
||||||
Requires: openssl
|
|
||||||
|
|
||||||
Requires: bash coreutils grep
|
Requires: bash coreutils grep
|
||||||
|
|
||||||
@ -414,9 +419,6 @@ Requires: psmisc
|
|||||||
|
|
||||||
Requires: coreutils
|
Requires: coreutils
|
||||||
Requires(pre): /usr/sbin/useradd
|
Requires(pre): /usr/sbin/useradd
|
||||||
# Bison SQL parser
|
|
||||||
# WHY?? (testsuite??)
|
|
||||||
Requires: bison
|
|
||||||
# We require this to be present for %%{_tmpfilesdir}
|
# We require this to be present for %%{_tmpfilesdir}
|
||||||
Requires: systemd
|
Requires: systemd
|
||||||
# Make sure it's there when scriptlets run, too
|
# Make sure it's there when scriptlets run, too
|
||||||
@ -546,6 +548,16 @@ Requires: sphinx libsphinxclient
|
|||||||
The Sphinx storage engine for MariaDB.
|
The Sphinx storage engine for MariaDB.
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %{with cassandra}
|
||||||
|
%package cassandra-engine
|
||||||
|
Summary: The Cassandra storage engine for MariaDB - EXPERIMENTAL VERSION
|
||||||
|
Requires: %{name}-server%{?_isa} = %{sameevr}
|
||||||
|
BuildRequires: cassandra thrift-devel
|
||||||
|
|
||||||
|
%description cassandra-engine
|
||||||
|
The Cassandra storage engine for MariaDB. EXPERIMENTAL VERSION!
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%package server-utils
|
%package server-utils
|
||||||
Summary: Non-essential server utilities for MariaDB/MySQL applications
|
Summary: Non-essential server utilities for MariaDB/MySQL applications
|
||||||
@ -829,6 +841,7 @@ export CFLAGS CXXFLAGS
|
|||||||
-DCONC_WITH_SSL=%{?with_clibrary:ON}%{!?with_clibrary:NO} \
|
-DCONC_WITH_SSL=%{?with_clibrary:ON}%{!?with_clibrary:NO} \
|
||||||
-DWITH_SSL=system \
|
-DWITH_SSL=system \
|
||||||
-DWITH_ZLIB=system \
|
-DWITH_ZLIB=system \
|
||||||
|
-DWITH_JEMALLOC=no \
|
||||||
-DLZ4_LIBS=%{_libdir}/liblz4.so \
|
-DLZ4_LIBS=%{_libdir}/liblz4.so \
|
||||||
-DWITH_INNODB_LZ4=%{?with_lz4:ON}%{!?with_lz4:OFF} \
|
-DWITH_INNODB_LZ4=%{?with_lz4:ON}%{!?with_lz4:OFF} \
|
||||||
-DPLUGIN_MROONGA=%{?with_mroonga:DYNAMIC}%{!?with_mroonga:NO} \
|
-DPLUGIN_MROONGA=%{?with_mroonga:DYNAMIC}%{!?with_mroonga:NO} \
|
||||||
@ -838,6 +851,7 @@ export CFLAGS CXXFLAGS
|
|||||||
-DPLUGIN_SPHINX=%{?with_sphinx:DYNAMIC}%{!?with_sphinx:NO} \
|
-DPLUGIN_SPHINX=%{?with_sphinx:DYNAMIC}%{!?with_sphinx:NO} \
|
||||||
-DPLUGIN_TOKUDB=%{?with_tokudb:DYNAMIC}%{!?with_tokudb:NO} \
|
-DPLUGIN_TOKUDB=%{?with_tokudb:DYNAMIC}%{!?with_tokudb:NO} \
|
||||||
-DPLUGIN_CONNECT=%{?with_connect:DYNAMIC}%{!?with_connect:NO} \
|
-DPLUGIN_CONNECT=%{?with_connect:DYNAMIC}%{!?with_connect:NO} \
|
||||||
|
-DWITH_CASSANDRA=%{?with_cassandra:TRUE}%{!?with_cassandra:FALSE} \
|
||||||
-DCONNECT_WITH_MONGO=OFF \
|
-DCONNECT_WITH_MONGO=OFF \
|
||||||
-DCONNECT_WITH_JDBC=OFF \
|
-DCONNECT_WITH_JDBC=OFF \
|
||||||
%{?with_debug: -DCMAKE_BUILD_TYPE=Debug -DWITH_ASAN=OFF -DWITH_INNODB_EXTRA_DEBUG=ON -DWITH_VALGRIND=ON}
|
%{?with_debug: -DCMAKE_BUILD_TYPE=Debug -DWITH_ASAN=OFF -DWITH_INNODB_EXTRA_DEBUG=ON -DWITH_VALGRIND=ON}
|
||||||
@ -1358,6 +1372,7 @@ fi
|
|||||||
%{?with_tokudb:%exclude %{_libdir}/%{pkg_name}/plugin/ha_tokudb.so}
|
%{?with_tokudb:%exclude %{_libdir}/%{pkg_name}/plugin/ha_tokudb.so}
|
||||||
%{?with_ggsapi:%exclude %{_libdir}/%{pkg_name}/plugin/auth_gssapi.so}
|
%{?with_ggsapi:%exclude %{_libdir}/%{pkg_name}/plugin/auth_gssapi.so}
|
||||||
%{?with_sphinx:%exclude %{_libdir}/%{pkg_name}/plugin/ha_sphinx.so}
|
%{?with_sphinx:%exclude %{_libdir}/%{pkg_name}/plugin/ha_sphinx.so}
|
||||||
|
%{?with_cassandra:%exclude %{_libdir}/%{pkg_name}/plugin/ha_cassandra.so}
|
||||||
%if %{with clibrary}
|
%if %{with clibrary}
|
||||||
%exclude %{_libdir}/%{pkg_name}/plugin/dialog.so
|
%exclude %{_libdir}/%{pkg_name}/plugin/dialog.so
|
||||||
%exclude %{_libdir}/%{pkg_name}/plugin/mysql_clear_password.so
|
%exclude %{_libdir}/%{pkg_name}/plugin/mysql_clear_password.so
|
||||||
@ -1498,6 +1513,12 @@ fi
|
|||||||
%{_libdir}/%{pkg_name}/plugin/ha_connect.so
|
%{_libdir}/%{pkg_name}/plugin/ha_connect.so
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %{with cassandra}
|
||||||
|
%files cassandra-engine
|
||||||
|
%config(noreplace) %{_sysconfdir}/my.cnf.d/cassandra.cnf
|
||||||
|
%{_libdir}/%{pkg_name}/plugin/ha_cassandra.so
|
||||||
|
%endif
|
||||||
|
|
||||||
%files server-utils
|
%files server-utils
|
||||||
# Perl utilities
|
# Perl utilities
|
||||||
%{_bindir}/mysql_convert_table_format
|
%{_bindir}/mysql_convert_table_format
|
||||||
|
Loading…
Reference in New Issue
Block a user