From 122e9d3bd7ac8a774a8fcfdfbc44f78011e4a4ff Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Wed, 13 Jul 2022 14:02:26 +0300 Subject: [PATCH] Disable capstone for riscv64; add BR libatomic Signed-off-by: David Abdurachmanov --- qemu.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/qemu.spec b/qemu.spec index 5337582..be69860 100644 --- a/qemu.spec +++ b/qemu.spec @@ -146,10 +146,12 @@ %define have_capstone_devel 0 %if 0%{?fedora} +%ifnarch riscv64 # capstone-devel is only on Fedora. Use it if it's available, but # if not, use the internal qemu submodule copy %define have_capstone_devel 1 %endif +%endif %define have_librdma 1 %ifarch %{arm} @@ -322,7 +324,7 @@ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release} Summary: QEMU is a FAST! processor emulator Name: qemu Version: 7.0.0 -Release: %{baserelease}%{?rcrel}%{?dist} +Release: %{baserelease}%{?rcrel}.0.riscv64%{?dist} Epoch: 2 License: GPLv2 and BSD and MIT and CC-BY URL: http://www.qemu.org/ @@ -415,6 +417,10 @@ BuildRequires: pkgconfig(gbm) BuildRequires: perl-Test-Harness BuildRequires: libslirp-devel BuildRequires: libbpf-devel +%ifarch riscv64 +# if -pthread is used GCC SPEC will add --as-needed -latomic --no-as-needed for linker +BuildRequires: libatomic-static +%endif # Fedora specific @@ -2716,6 +2722,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Wed Jul 13 2022 David Abdurachmanov - 7.0.0-6.0.riscv64 +- Disable capstone on riscv64 and add BR libatomic + * Sat Jun 11 2022 Cole Robinson - 7.0.0-6 - Adjust for Xen dropping 32bit arches