diff options
| author |   John Helmert III <ajak@gentoo.org> | 2021-10-10 22:46:10 -0500 |
|---|---|---|
| committer | John Helmert III <ajak@gentoo.org> | 2021-10-10 22:47:42 -0500 |
| commit | 41a325ea429a98833868c9370f5ee2c7af540477 (patch) | |
| tree | 1f1a110f85eecd387402c4f2b48817c06c3b2a8f /app-emulation/qemu/files | |
| parent | dev-perl/Regexp-Util: Stabilize 0.5.0 x86, #817503 (diff) | |
| download | gentoo-41a325ea429a98833868c9370f5ee2c7af540477.tar.gz gentoo-41a325ea429a98833868c9370f5ee2c7af540477.tar.bz2 gentoo-41a325ea429a98833868c9370f5ee2c7af540477.zip | |
app-emulation/qemu: fix build failure when libbpf is present
Closes: https://bugs.gentoo.org/814458
Signed-off-by: John Helmert III <ajak@gentoo.org>
Diffstat (limited to 'app-emulation/qemu/files')
| -rw-r--r-- | app-emulation/qemu/files/qemu-6.1.0-automagic-libbpf.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/app-emulation/qemu/files/qemu-6.1.0-automagic-libbpf.patch b/app-emulation/qemu/files/qemu-6.1.0-automagic-libbpf.patch new file mode 100644 index 000000000000..d067650dc8fa --- /dev/null +++ b/app-emulation/qemu/files/qemu-6.1.0-automagic-libbpf.patch @@ -0,0 +1,21 @@ +commit 080832e4f4801a28bd1170c49e61f6a0f5f05d03 +Author: Paolo Bonzini <pbonzini@redhat.com> +Date: Tue Sep 7 12:45:12 2021 +0200 + + ebpf: only include in system emulators + + eBPF files are being included in user emulators, which is useless and + also breaks compilation because ebpf/trace-events is only processed + if a system emulator is included in the build. + + Resolves: https://gitlab.com/qemu-project/qemu/-/issues/566 + Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> + Signed-off-by: Jason Wang <jasowang@redhat.com> + +diff --git a/ebpf/meson.build b/ebpf/meson.build +index 9cd0635370..2dd0fd8948 100644 +--- a/ebpf/meson.build ++++ b/ebpf/meson.build +@@ -1 +1 @@ +-common_ss.add(when: libbpf, if_true: files('ebpf_rss.c'), if_false: files('ebpf_rss-stub.c')) ++softmmu_ss.add(when: libbpf, if_true: files('ebpf_rss.c'), if_false: files('ebpf_rss-stub.c')) |