[PATCH-for-8.0 1/5] cpu: Remove capstone meson dependency

Philippe Mathieu-Daudé posted 5 patches 3 years, 2 months ago
Maintainers: Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Yanan Wang <wangyanan55@huawei.com>, Richard Henderson <richard.henderson@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Thomas Huth <thuth@redhat.com>
[PATCH-for-8.0 1/5] cpu: Remove capstone meson dependency
Posted by Philippe Mathieu-Daudé 3 years, 2 months ago
Only disas.c requires capstone CFLAGS, not cpu.c.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 meson.build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 5c6b5a1c75..92d449f854 100644
--- a/meson.build
+++ b/meson.build
@@ -3097,11 +3097,12 @@ if have_block
 endif
 
 common_ss.add(files('cpus-common.c'))
+specific_ss.add(files('cpu.c'))
 
 subdir('softmmu')
 
 common_ss.add(capstone)
-specific_ss.add(files('cpu.c', 'disas.c'), capstone)
+specific_ss.add(files('disas.c'), capstone)
 
 # Work around a gcc bug/misfeature wherein constant propagation looks
 # through an alias:
-- 
2.38.1


Re: [PATCH-for-8.0 1/5] cpu: Remove capstone meson dependency
Posted by Marc-André Lureau 2 years, 11 months ago
On Wed, Nov 30, 2022 at 5:55 PM Philippe Mathieu-Daudé
<philmd@linaro.org> wrote:
>
> Only disas.c requires capstone CFLAGS, not cpu.c.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>


> ---
>  meson.build | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meson.build b/meson.build
> index 5c6b5a1c75..92d449f854 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -3097,11 +3097,12 @@ if have_block
>  endif
>
>  common_ss.add(files('cpus-common.c'))
> +specific_ss.add(files('cpu.c'))
>
>  subdir('softmmu')
>
>  common_ss.add(capstone)
> -specific_ss.add(files('cpu.c', 'disas.c'), capstone)
> +specific_ss.add(files('disas.c'), capstone)
>
>  # Work around a gcc bug/misfeature wherein constant propagation looks
>  # through an alias:
> --
> 2.38.1
>
>


-- 
Marc-André Lureau