rpms/mariadb10.11
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix building of TokuDB with Jemalloc 5

Browse Source
This commit is contained in:
Michal Schorm 2019-05-10 03:48:29 +02:00
parent df9d3ff3d8
commit 40688c3365
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mariadb.spec
View File

@ -72,7 +72,7 @@
%bcond_without gssapi %bcond_without gssapi
# For some use cases we do not need some parts of the package. Set to "...with" to exclude # For some use cases we do not need some parts of the package. Set to "...with" to exclude
%if 0%{?fedora} >= 28 || 0%{?rhel} > 7 %if 0%{?fedora} || 0%{?rhel} > 7
%bcond_with clibrary %bcond_with clibrary
%else %else
%bcond_without clibrary %bcond_without clibrary
@ -160,7 +160,7 @@
Name: mariadb Name: mariadb
Version: 10.3.12 Version: 10.3.12
Release: 13%{?with_debug:.debug}%{?dist} Release: 14%{?with_debug:.debug}%{?dist}
Epoch: 3 Epoch: 3
Summary: A very fast and robust SQL database server Summary: A very fast and robust SQL database server
@ -844,7 +844,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=%{?with_tokudb:YES}%{!?with_tokudb:NO} \ -DWITH_JEMALLOC=%{?with_tokudb:yes}%{!?with_tokudb: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} \
@ -1080,9 +1080,9 @@ rm %{buildroot}%{_sysconfdir}/my.cnf.d/mysql-clients.cnf
rm %{buildroot}%{_mandir}/man1/tokuftdump.1* rm %{buildroot}%{_mandir}/man1/tokuftdump.1*
rm %{buildroot}%{_mandir}/man1/tokuft_logprint.1* rm %{buildroot}%{_mandir}/man1/tokuft_logprint.1*
%else %else
%if 0%{?fedora} >= 28 || 0%{?rhel} > 7 %if 0%{?fedora} || 0%{?rhel} > 7
mkdir -p %{buildroot}%{_unitdir}/mariadb.service.d # Move the upstream file to the correct location
echo -e '[Service]\nEnvironment="LD_PRELOAD=%{_libdir}/libjemalloc.so.2"' >> %{buildroot}%{_unitdir}/mariadb.service.d/tokudb.conf mv %{buildroot}/etc/systemd/system/mariadb.service.d/tokudb.conf %{buildroot}%{_unitdir}/mariadb.service.d/tokudb.conf
%endif %endif
%endif %endif
@ -1604,6 +1604,9 @@ fi
%endif %endif
%changelog %changelog
* Thu Mar 21 2019 Michal Schorm <mschorm@redhat.com> - 10.3.12-14
- Fix building of TokuDB with Jemalloc 5
* Thu Mar 21 2019 Michal Schorm <mschorm@redhat.com> - 10.3.12-13 * Thu Mar 21 2019 Michal Schorm <mschorm@redhat.com> - 10.3.12-13
- Add patch for mysqld_safe --dry-run - Add patch for mysqld_safe --dry-run