* [RFC PATCH] meson.build: don't include libbpf in the common source set
@ 2021-10-05 18:24 Alex Bennée
2021-10-05 18:51 ` Richard Henderson
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Alex Bennée @ 2021-10-05 18:24 UTC (permalink / raw)
To: qemu-devel; +Cc: Alex Bennée
This library is only needed for the softmmu targets and as such
break static *-user builds where libbpf is detected and it tries to
link it into the user binaries.
Fixes: 46627f41b6 ("ebpf: Added eBPF RSS loader.")
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 60f4f45165..d8bcf13b21 100644
--- a/meson.build
+++ b/meson.build
@@ -2307,7 +2307,7 @@ subdir('bsd-user')
subdir('linux-user')
subdir('ebpf')
-common_ss.add(libbpf)
+softmmu_ss.add(libbpf)
bsd_user_ss.add(files('gdbstub.c'))
specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss)
--
2.30.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [RFC PATCH] meson.build: don't include libbpf in the common source set
2021-10-05 18:24 [RFC PATCH] meson.build: don't include libbpf in the common source set Alex Bennée
@ 2021-10-05 18:51 ` Richard Henderson
2021-10-05 19:00 ` Philippe Mathieu-Daudé
2021-10-05 19:27 ` Paolo Bonzini
2 siblings, 0 replies; 7+ messages in thread
From: Richard Henderson @ 2021-10-05 18:51 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
On 10/5/21 11:24 AM, Alex Bennée wrote:
> This library is only needed for the softmmu targets and as such
> break static *-user builds where libbpf is detected and it tries to
> link it into the user binaries.
>
> Fixes: 46627f41b6 ("ebpf: Added eBPF RSS loader.")
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> meson.build | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meson.build b/meson.build
> index 60f4f45165..d8bcf13b21 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -2307,7 +2307,7 @@ subdir('bsd-user')
> subdir('linux-user')
> subdir('ebpf')
>
> -common_ss.add(libbpf)
> +softmmu_ss.add(libbpf)
Indeed. I also think it should go into ebpf/meson.build, just to keep everything
together. Something like
softmmu_ss.add(when: libbpf,
if_true: files('ebpf_rss.c', libbpf),
if_false: files('ebpf_rss-stub.c'))
r~
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [RFC PATCH] meson.build: don't include libbpf in the common source set
2021-10-05 18:24 [RFC PATCH] meson.build: don't include libbpf in the common source set Alex Bennée
2021-10-05 18:51 ` Richard Henderson
@ 2021-10-05 19:00 ` Philippe Mathieu-Daudé
2021-10-05 19:28 ` Paolo Bonzini
2021-10-05 19:27 ` Paolo Bonzini
2 siblings, 1 reply; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-10-05 19:00 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
On 10/5/21 20:24, Alex Bennée wrote:
> This library is only needed for the softmmu targets and as such
> break static *-user builds where libbpf is detected and it tries to
> link it into the user binaries.
>
> Fixes: 46627f41b6 ("ebpf: Added eBPF RSS loader.")
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> meson.build | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meson.build b/meson.build
> index 60f4f45165..d8bcf13b21 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -2307,7 +2307,7 @@ subdir('bsd-user')
> subdir('linux-user')
> subdir('ebpf')
>
> -common_ss.add(libbpf)
> +softmmu_ss.add(libbpf)
>
> bsd_user_ss.add(files('gdbstub.c'))
> specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss)
>
Patch already pending on the list:
https://www.mail-archive.com/qemu-devel@nongnu.org/msg834876.html
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [RFC PATCH] meson.build: don't include libbpf in the common source set
2021-10-05 18:24 [RFC PATCH] meson.build: don't include libbpf in the common source set Alex Bennée
2021-10-05 18:51 ` Richard Henderson
2021-10-05 19:00 ` Philippe Mathieu-Daudé
@ 2021-10-05 19:27 ` Paolo Bonzini
2021-10-05 20:25 ` Richard Henderson
2 siblings, 1 reply; 7+ messages in thread
From: Paolo Bonzini @ 2021-10-05 19:27 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
On 05/10/21 20:24, Alex Bennée wrote:
> This library is only needed for the softmmu targets and as such
> break static *-user builds where libbpf is detected and it tries to
> link it into the user binaries.
>
> Fixes: 46627f41b6 ("ebpf: Added eBPF RSS loader.")
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> meson.build | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meson.build b/meson.build
> index 60f4f45165..d8bcf13b21 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -2307,7 +2307,7 @@ subdir('bsd-user')
> subdir('linux-user')
> subdir('ebpf')
>
> -common_ss.add(libbpf)
> +softmmu_ss.add(libbpf)
It should not be needed at all, since ebpf/meson.build has
softmmu_ss.add(when: libbpf, if_true: files('ebpf_rss.c'), if_false:
files('ebpf_rss-stub.c'))
(which already adds libbpf if needed).
Paolo
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [RFC PATCH] meson.build: don't include libbpf in the common source set
2021-10-05 19:00 ` Philippe Mathieu-Daudé
@ 2021-10-05 19:28 ` Paolo Bonzini
0 siblings, 0 replies; 7+ messages in thread
From: Paolo Bonzini @ 2021-10-05 19:28 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, Alex Bennée, qemu-devel
On 05/10/21 21:00, Philippe Mathieu-Daudé wrote:
> On 10/5/21 20:24, Alex Bennée wrote:
>> This library is only needed for the softmmu targets and as such
>> break static *-user builds where libbpf is detected and it tries to
>> link it into the user binaries.
>>
>> Fixes: 46627f41b6 ("ebpf: Added eBPF RSS loader.")
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> ---
>> meson.build | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meson.build b/meson.build
>> index 60f4f45165..d8bcf13b21 100644
>> --- a/meson.build
>> +++ b/meson.build
>> @@ -2307,7 +2307,7 @@ subdir('bsd-user')
>> subdir('linux-user')
>> subdir('ebpf')
>>
>> -common_ss.add(libbpf)
>> +softmmu_ss.add(libbpf)
>>
>> bsd_user_ss.add(files('gdbstub.c'))
>> specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss)
>>
>
> Patch already pending on the list:
> https://www.mail-archive.com/qemu-devel@nongnu.org/msg834876.html
Not the same patch, that one is already in.
Paolo
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [RFC PATCH] meson.build: don't include libbpf in the common source set
2021-10-05 19:27 ` Paolo Bonzini
@ 2021-10-05 20:25 ` Richard Henderson
2021-10-05 22:21 ` Paolo Bonzini
0 siblings, 1 reply; 7+ messages in thread
From: Richard Henderson @ 2021-10-05 20:25 UTC (permalink / raw)
To: Paolo Bonzini, Alex Bennée, qemu-devel
On 10/5/21 12:27 PM, Paolo Bonzini wrote:
> On 05/10/21 20:24, Alex Bennée wrote:
>> This library is only needed for the softmmu targets and as such
>> break static *-user builds where libbpf is detected and it tries to
>> link it into the user binaries.
>>
>> Fixes: 46627f41b6 ("ebpf: Added eBPF RSS loader.")
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> ---
>> meson.build | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meson.build b/meson.build
>> index 60f4f45165..d8bcf13b21 100644
>> --- a/meson.build
>> +++ b/meson.build
>> @@ -2307,7 +2307,7 @@ subdir('bsd-user')
>> subdir('linux-user')
>> subdir('ebpf')
>> -common_ss.add(libbpf)
>> +softmmu_ss.add(libbpf)
>
> It should not be needed at all, since ebpf/meson.build has
>
> softmmu_ss.add(when: libbpf, if_true: files('ebpf_rss.c'), if_false:
> files('ebpf_rss-stub.c'))
>
> (which already adds libbpf if needed).
Ooo, magic side effects. I'll note that the manual doesn't say that it adds and
dependencies from varnames_and_deps, only that it checks them.
r~
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [RFC PATCH] meson.build: don't include libbpf in the common source set
2021-10-05 20:25 ` Richard Henderson
@ 2021-10-05 22:21 ` Paolo Bonzini
0 siblings, 0 replies; 7+ messages in thread
From: Paolo Bonzini @ 2021-10-05 22:21 UTC (permalink / raw)
To: Richard Henderson, Alex Bennée, qemu-devel
On 05/10/21 22:25, Richard Henderson wrote:
> On 10/5/21 12:27 PM, Paolo Bonzini wrote:
>> On 05/10/21 20:24, Alex Bennée wrote:
>>> This library is only needed for the softmmu targets and as such
>>> break static *-user builds where libbpf is detected and it tries to
>>> link it into the user binaries.
>>>
>>> Fixes: 46627f41b6 ("ebpf: Added eBPF RSS loader.")
>>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>>> ---
>>> meson.build | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/meson.build b/meson.build
>>> index 60f4f45165..d8bcf13b21 100644
>>> --- a/meson.build
>>> +++ b/meson.build
>>> @@ -2307,7 +2307,7 @@ subdir('bsd-user')
>>> subdir('linux-user')
>>> subdir('ebpf')
>>> -common_ss.add(libbpf)
>>> +softmmu_ss.add(libbpf)
>>
>> It should not be needed at all, since ebpf/meson.build has
>>
>> softmmu_ss.add(when: libbpf, if_true: files('ebpf_rss.c'), if_false:
>> files('ebpf_rss-stub.c'))
>>
>> (which already adds libbpf if needed).
>
> Ooo, magic side effects. I'll note that the manual doesn't say that it
> adds and dependencies from varnames_and_deps, only that it checks them.
Good point, it's in an example above:
# Include zlib.c if the zlib dependency was found, and link zlib
# in the executable
ss.add(when: zlib, if_true: files('zlib.c'))
Paolo
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-10-05 22:22 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-05 18:24 [RFC PATCH] meson.build: don't include libbpf in the common source set Alex Bennée
2021-10-05 18:51 ` Richard Henderson
2021-10-05 19:00 ` Philippe Mathieu-Daudé
2021-10-05 19:28 ` Paolo Bonzini
2021-10-05 19:27 ` Paolo Bonzini
2021-10-05 20:25 ` Richard Henderson
2021-10-05 22:21 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).