[PATCH RFC 3/4] rpm: use %{qemu_sysemu_kvm_arches}

Daniel P. Berrangé posted 4 patches 2 years, 6 months ago
[PATCH RFC 3/4] rpm: use %{qemu_sysemu_kvm_arches}
Posted by Daniel P. Berrangé 2 years, 6 months ago
This macro reflects the architectures on which KVM is available with
the distro QEMU build.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 libvirt.spec.in | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 641ff179e7..e520def44b 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -19,17 +19,13 @@
         %else
             %define qemu_sysemu_host_arches aarch64 s390x %{power64} x86_64
         %endif
+        %define qemu_sysemu_kvm_arches %{qemu_sysemu_host_arches}
     %else
         %define qemu_sysemu_host_arches aarch64 %{arm} %{ix86} %{mips} %{power64} riscv64 s390x x86_64
+        %define qemu_sysemu_kvm_arches aarch64 %{ix86} %{mips} %{power64} riscv64 s390x x86_64
     %endif
 %endif
 
-%if 0%{?rhel}
-    %define arches_qemu_kvm %{qemu_sysemu_host_arches}
-%else
-    %define arches_qemu_kvm %{ix86} x86_64 %{power64} %{arm} aarch64 s390x
-%endif
-
 %define arches_64bit            x86_64 %{power64} aarch64 s390x riscv64
 %define arches_x86              %{ix86} x86_64
 
@@ -55,7 +51,7 @@
 %define with_libxl         0%{!?_without_libxl:1}
 %define with_vbox          0%{!?_without_vbox:1}
 
-%ifarch %{arches_qemu_kvm}
+%ifarch %{qemu_sysemu_kvm_arches}
     %define with_qemu_kvm      %{with_qemu}
 %else
     %define with_qemu_kvm      0
@@ -84,7 +80,7 @@
     %if 0%{?rhel} > 8
         %define with_storage_gluster 0
     %else
-        %ifnarch %{arches_qemu_kvm}
+        %ifnarch %{qemu_sysemu_kvm_arches}
             %define with_storage_gluster 0
         %endif
     %endif
@@ -164,7 +160,7 @@
     %define with_sanlock 0%{!?_without_sanlock:1}
 %endif
 %if 0%{?rhel}
-    %ifarch %{arches_qemu_kvm}
+    %ifarch %{qemu_sysemu_kvm_arches}
         %define with_sanlock 0%{!?_without_sanlock:1}
     %endif
 %endif
-- 
2.41.0