Fix %ifarch usage

When rebuilding mariadb on EL7, I noticed that tokudb, mroonga, and
rocksdb were enabled, despite what this conditional appears to do.
After some experimentation, I can see that %ifarch does not support
appending another conditional with &&.  To achieve the desired logic,
the statement must be separate conditionals.
This commit is contained in:
Carl George 2020-08-02 22:24:49 -05:00 committed by mschorm
parent cdfc0ff977
commit 8dd95cd3f6

View File

@ -39,7 +39,8 @@
# https://mariadb.com/kb/en/library/about-myrocks-for-mariadb/
# RocksDB engine is available only for x86_64
# RocksDB may be built with jemalloc, if specified in CMake
%ifarch x86_64 && 0%{?fedora}
%ifarch x86_64
%if 0%{?fedora}
%bcond_without tokudb
%bcond_without mroonga
%bcond_without rocksdb
@ -48,6 +49,7 @@
%bcond_with mroonga
%bcond_with rocksdb
%endif
%endif
# The Open Query GRAPH engine (OQGRAPH) is a computation engine allowing
# hierarchies and more complex graph structures to be handled in a relational fashion