From f5eb0b7c4d187559a068c98d188c2357e1383486 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Fri, 10 May 2019 04:51:02 +0200 Subject: [PATCH] Fix building with / without lz4 --- mariadb.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mariadb.spec b/mariadb.spec index 83d3303..e95dda6 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -105,8 +105,6 @@ %bcond_with debug # Page compression algorithms for InnoDB & XtraDB -# lz4 currently cannot be turned off by CMake, only by not having lz4-devel package in the buildroot -# https://jira.mariadb.org/browse/MDEV-15932 %bcond_without lz4 @@ -846,7 +844,9 @@ export CFLAGS CXXFLAGS -DWITH_ZLIB=system \ -DWITH_JEMALLOC=%{?with_tokudb:yes}%{!?with_tokudb:no} \ -DLZ4_LIBS=%{_libdir}/liblz4.so \ + -DLZ4_LIBS=%{?with_lz4:%{_libdir}/liblz4.so}%{!?with_lz4:} \ -DWITH_INNODB_LZ4=%{?with_lz4:ON}%{!?with_lz4:OFF} \ + -DWITH_ROCKSDB_LZ4=%{?with_lz4:ON}%{!?with_lz4:OFF} \ -DPLUGIN_MROONGA=%{?with_mroonga:DYNAMIC}%{!?with_mroonga:NO} \ -DPLUGIN_OQGRAPH=%{?with_oqgraph:DYNAMIC}%{!?with_oqgraph:NO} \ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=%{?with_cracklib:DYNAMIC}%{!?with_cracklib:NO} \ @@ -1606,6 +1606,7 @@ fi %changelog * Thu Mar 21 2019 Michal Schorm - 10.3.12-14 - Fix building of TokuDB with Jemalloc 5 +- Fix building with / without lz4 * Thu Mar 21 2019 Michal Schorm - 10.3.12-13 - Add patch for mysqld_safe --dry-run