| Message ID | 20241212092632.18538-3-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | system/meson: Restrict libSDL/libpmem/libdaxctl CPPFLAGS to vl/physmem | expand |
On Thu, 12 Dec 2024, Philippe Mathieu-Daudé wrote: > Only physmem.c includes libpmem and libdaxctl headers. > No need to pass them to all system_ss[] files. I think doing this patch first would leave the other one unnecessary so you could do both in one patch with less churn and maybe reduce this series to a single patch. Regards, BALATON Zoltan > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > system/meson.build | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/system/meson.build b/system/meson.build > index f7e2c8b826f..50d915bd80c 100644 > --- a/system/meson.build > +++ b/system/meson.build > @@ -2,10 +2,13 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( > 'arch_init.c', > 'ioport.c', > 'memory.c', > - 'physmem.c', > 'watchpoint.c', > )]) > > +specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( > + 'physmem.c', > +), libpmem, libdaxctl]) > + > system_ss.add(files( > 'balloon.c', > 'bootdevice.c', > @@ -23,7 +26,7 @@ system_ss.add(files( > 'runstate-hmp-cmds.c', > 'runstate.c', > 'tpm-hmp-cmds.c', > -), libpmem, libdaxctl) > +)) > > system_ss.add(files( > 'vl.c', >
diff --git a/system/meson.build b/system/meson.build index f7e2c8b826f..50d915bd80c 100644 --- a/system/meson.build +++ b/system/meson.build @@ -2,10 +2,13 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', 'ioport.c', 'memory.c', - 'physmem.c', 'watchpoint.c', )]) +specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( + 'physmem.c', +), libpmem, libdaxctl]) + system_ss.add(files( 'balloon.c', 'bootdevice.c', @@ -23,7 +26,7 @@ system_ss.add(files( 'runstate-hmp-cmds.c', 'runstate.c', 'tpm-hmp-cmds.c', -), libpmem, libdaxctl) +)) system_ss.add(files( 'vl.c',
Only physmem.c includes libpmem and libdaxctl headers. No need to pass them to all system_ss[] files. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- system/meson.build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)