ebpf: really include it only in system emulators

[PATCH] ebpf: really include it only in system emulators

Posted by Paolo Bonzini 2 years, 6 months ago

eBPF libraries are being included in user emulators, which is useless and
also breaks --static compilation if a shared library for libbpf is
present in the system.

Reported-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 meson.build | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meson.build b/meson.build
index ca7b9d60af..6b7487b725 100644
--- a/meson.build
+++ b/meson.build
@@ -2595,8 +2595,6 @@ subdir('bsd-user')
 subdir('linux-user')
 subdir('ebpf')
 
-common_ss.add(libbpf)
-
 bsd_user_ss.add(files('gdbstub.c'))
 specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss)
 
-- 
2.31.1

Re: [PATCH] ebpf: really include it only in system emulators

Posted by Richard Henderson 2 years, 6 months ago

On 10/12/21 9:22 AM, Paolo Bonzini wrote:
> eBPF libraries are being included in user emulators, which is useless and
> also breaks --static compilation if a shared library for libbpf is
> present in the system.
> 
> Reported-by: Alex Bennée<alex.bennee@linaro.org>
> Signed-off-by: Paolo Bonzini<pbonzini@redhat.com>
> ---
>   meson.build | 2 --
>   1 file changed, 2 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

Re: [PATCH] ebpf: really include it only in system emulators

Posted by Alex Bennée 2 years, 6 months ago

Paolo Bonzini <pbonzini@redhat.com> writes:

> eBPF libraries are being included in user emulators, which is useless and
> also breaks --static compilation if a shared library for libbpf is
> present in the system.
>
> Reported-by: Alex Bennée <alex.bennee@linaro.org>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  meson.build | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index ca7b9d60af..6b7487b725 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -2595,8 +2595,6 @@ subdir('bsd-user')
>  subdir('linux-user')
>  subdir('ebpf')
>  
> -common_ss.add(libbpf)
> -
>  bsd_user_ss.add(files('gdbstub.c'))
>  specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss)


-- 
Alex Bennée