From 06fc78c1d765173b183a968d1e2930936eae1f88 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Wed, 6 Mar 2024 10:35:53 +0100 Subject: [PATCH] Remove architectures which are not supported by Fedora from conditionals --- mysql8.0.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mysql8.0.spec b/mysql8.0.spec index e74ab2c..fc0501a 100644 --- a/mysql8.0.spec +++ b/mysql8.0.spec @@ -156,7 +156,7 @@ BuildRequires: mecab-devel BuildRequires: bison BuildRequires: libzstd-devel BuildRequires: libcurl-devel -%ifnarch aarch64 %{arm} s390 s390x +%ifnarch aarch64 s390x BuildRequires: numactl-devel %endif BuildRequires: openssl @@ -463,15 +463,15 @@ popd cat %{SOURCE50} | tee -a mysql-test/%{skiplist} # disable some tests failing on different architectures -%ifarch %{arm} aarch64 +%ifarch aarch64 cat %{SOURCE51} | tee -a mysql-test/%{skiplist} %endif -%ifarch s390 s390x +%ifarch s390x cat %{SOURCE52} | tee -a mysql-test/%{skiplist} %endif -%ifarch ppc ppc64 ppc64p7 ppc64le +%ifarch ppc64le cat %{SOURCE53} | tee -a mysql-test/%{skiplist} %endif @@ -525,10 +525,10 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} \ -DSYSTEMD_SERVICE_NAME="%{daemon_name}" \ -DSYSTEMD_PID_DIR="%{pidfiledir}" \ -DWITH_INNODB_MEMCACHED=ON \ -%ifnarch aarch64 %{arm} s390 s390x +%ifnarch aarch64 s390x -DWITH_NUMA=ON \ %endif -%ifarch s390 s390x +%ifarch s390x -DUSE_LD_GOLD=OFF \ %endif -DWITH_ROUTER=OFF \