[v1] meson: Move the creation of the library to the main meson.build

[RFC PATCH 01/10] migration: Only add migration files to the Meson sourceset

Posted by Philippe Mathieu-Daudé 5 years, 1 month ago

I'm not sure how that works, but keep the use of Meson
sourcesets consistent, only add source files.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 migration/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/migration/meson.build b/migration/meson.build
index b5b71c8060..55c9e1329f 100644
--- a/migration/meson.build
+++ b/migration/meson.build
@@ -14,7 +14,7 @@ libmigration = static_library('migration', sources: migration_files + genh,
                               build_by_default: false)
 migration = declare_dependency(link_with: libmigration,
                                dependencies: [zlib, qom, io])
-softmmu_ss.add(migration)
+softmmu_ss.add(migration_files)
 
 softmmu_ss.add(files(
   'block-dirty-bitmap.c',
-- 
2.26.2

Re: [RFC PATCH 01/10] migration: Only add migration files to the Meson sourceset

Posted by Philippe Mathieu-Daudé 5 years, 1 month ago

On Tue, Oct 6, 2020 at 1:12 PM Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> I'm not sure how that works, but keep the use of Meson
> sourcesets consistent, only add source files.
>

Eventually:
Fixes: 5516623020 ("meson: convert migration directory to Meson")

> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  migration/meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/migration/meson.build b/migration/meson.build
> index b5b71c8060..55c9e1329f 100644
> --- a/migration/meson.build
> +++ b/migration/meson.build
> @@ -14,7 +14,7 @@ libmigration = static_library('migration', sources: migration_files + genh,
>                                build_by_default: false)
>  migration = declare_dependency(link_with: libmigration,
>                                 dependencies: [zlib, qom, io])
> -softmmu_ss.add(migration)
> +softmmu_ss.add(migration_files)
>
>  softmmu_ss.add(files(
>    'block-dirty-bitmap.c',
> --
> 2.26.2
>

Re: [RFC PATCH 01/10] migration: Only add migration files to the Meson sourceset

Posted by Paolo Bonzini 5 years, 1 month ago

On 06/10/20 13:12, Philippe Mathieu-Daudé wrote:
> I'm not sure how that works, but keep the use of Meson
> sourcesets consistent, only add source files.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  migration/meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/migration/meson.build b/migration/meson.build
> index b5b71c8060..55c9e1329f 100644
> --- a/migration/meson.build
> +++ b/migration/meson.build
> @@ -14,7 +14,7 @@ libmigration = static_library('migration', sources: migration_files + genh,
>                                build_by_default: false)
>  migration = declare_dependency(link_with: libmigration,
>                                 dependencies: [zlib, qom, io])
> -softmmu_ss.add(migration)
> +softmmu_ss.add(migration_files)

This would compile the file twice.  You can just drop this change and
fixup patch 6 instead.

Paolo