[PATCH 0/2] meson: Fix initrd-stress.img build

[PATCH 0/2] meson: Fix initrd-stress.img build

[Fabiano Rosas]

Just a small fix to the build of the initrd used by the migration
guestperf.py script.

$ cd build
$ make tests/migration/initrd-stress.img   <-- BROKEN
$ ./tests/migration/guestperf.py --binary /path/to/qemu-system-x86_64 \
--initrd ./tests/migration/initrd-stress.img --debug

Fabiano Rosas (2):
  meson: Remove leftover comment
  meson: Add static glib dependency for initrd-stress.img

 meson.build                 | 2 --
 tests/migration/meson.build | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
2.35.3

[PATCH 1/2] meson: Remove leftover comment

[Fabiano Rosas]

Commit d2e6f9272d ("fuzz: remove fork-fuzzing scaffolding") removed
the linker script and forgot to remove the comment.

Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
 meson.build | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meson.build b/meson.build
index ef181ff2df..ba1b7012cd 100644
--- a/meson.build
+++ b/meson.build
@@ -395,8 +395,6 @@ if targetos != 'sunos' and not get_option('tsan')
   qemu_ldflags += cc.get_supported_link_arguments('-Wl,--warn-common')
 endif
 
-# Specify linker-script with add_project_link_arguments so that it is not placed
-# within a linker --start-group/--end-group pair
 if get_option('fuzzing')
   # Specify a filter to only instrument code that is directly related to
   # virtual-devices.
-- 
2.35.3

[PATCH 2/2] meson: Add static glib dependency for initrd-stress.img

[Fabiano Rosas]

We recently moved glib detection code to meson but the static libs
were left out. Add a specific dependency for stress.c which is linked
statically.

$ make V=1 tests/migration/initrd-stress.img

before:
 cc -m64 -mcx16 -o tests/migration/stress ... -static -Wl,--start-group
 /usr/lib64/libglib-2.0.so -Wl,--end-group
 ...
 bin/ld: attempted static link of dynamic object `/usr/lib64/libglib-2.0.so'

after:
 cc -m64 -mcx16 -o tests/migration/stress ... -static -pthread
 -Wl,--start-group -lm /usr/lib64/libpcre.a -lglib-2.0 -Wl,--end-group

Fixes: fc9a809e0d ("build: move glib detection and workarounds to meson")
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
 tests/migration/meson.build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/migration/meson.build b/tests/migration/meson.build
index dd562355a1..ac71f13290 100644
--- a/tests/migration/meson.build
+++ b/tests/migration/meson.build
@@ -1,9 +1,11 @@
 sysprof = dependency('sysprof-capture-4', required: false)
+glib_static = dependency('glib-2.0', version: glib_req_ver, required: false,
+                         method: 'pkg-config', static: true)
 
 stress = executable(
   'stress',
   files('stress.c'),
-  dependencies: [glib, sysprof],
+  dependencies: [glib_static, sysprof],
   link_args: ['-static'],
   build_by_default: false,
 )
-- 
2.35.3

Re: [PATCH 0/2] meson: Fix initrd-stress.img build

[Paolo Bonzini]

Queued, thanks.

Paolo

Re: [PATCH 2/2] meson: Add static glib dependency for initrd-stress.img

[Juan Quintela]

Fabiano Rosas <farosas@suse.de> wrote:
> We recently moved glib detection code to meson but the static libs
> were left out. Add a specific dependency for stress.c which is linked
> statically.
>
> $ make V=1 tests/migration/initrd-stress.img
>
> before:
>  cc -m64 -mcx16 -o tests/migration/stress ... -static -Wl,--start-group
>  /usr/lib64/libglib-2.0.so -Wl,--end-group
>  ...
>  bin/ld: attempted static link of dynamic object `/usr/lib64/libglib-2.0.so'
>
> after:
>  cc -m64 -mcx16 -o tests/migration/stress ... -static -pthread
>  -Wl,--start-group -lm /usr/lib64/libpcre.a -lglib-2.0 -Wl,--end-group
>
> Fixes: fc9a809e0d ("build: move glib detection and workarounds to meson")
> Signed-off-by: Fabiano Rosas <farosas@suse.de>

Reviewed-by: Juan Quintela <quintela@redhat.com>
Tested-by: Juan Quintela <quintela@redhat.com>

queued.

Re: [PATCH 2/2] meson: Add static glib dependency for initrd-stress.img

[Daniel P. Berrangé]

On Thu, May 25, 2023 at 06:20:44PM -0300, Fabiano Rosas wrote:
> We recently moved glib detection code to meson but the static libs
> were left out. Add a specific dependency for stress.c which is linked
> statically.
> 
> $ make V=1 tests/migration/initrd-stress.img
> 
> before:
>  cc -m64 -mcx16 -o tests/migration/stress ... -static -Wl,--start-group
>  /usr/lib64/libglib-2.0.so -Wl,--end-group
>  ...
>  bin/ld: attempted static link of dynamic object `/usr/lib64/libglib-2.0.so'
> 
> after:
>  cc -m64 -mcx16 -o tests/migration/stress ... -static -pthread
>  -Wl,--start-group -lm /usr/lib64/libpcre.a -lglib-2.0 -Wl,--end-group
> 
> Fixes: fc9a809e0d ("build: move glib detection and workarounds to meson")
> Signed-off-by: Fabiano Rosas <farosas@suse.de>
> ---
>  tests/migration/meson.build | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/migration/meson.build b/tests/migration/meson.build
> index dd562355a1..ac71f13290 100644
> --- a/tests/migration/meson.build
> +++ b/tests/migration/meson.build
> @@ -1,9 +1,11 @@
>  sysprof = dependency('sysprof-capture-4', required: false)
> +glib_static = dependency('glib-2.0', version: glib_req_ver, required: false,
> +                         method: 'pkg-config', static: true)

Since required: false, the result might be "not found", which means
we'll still hit the linker error. I think we need to surround the
'executable()' bit in

  if glib_static.found()
     ...
  endif
  
>  
>  stress = executable(
>    'stress',
>    files('stress.c'),
> -  dependencies: [glib, sysprof],
> +  dependencies: [glib_static, sysprof],
>    link_args: ['-static'],
>    build_by_default: false,
>  )
> 

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PATCH 0/2] meson: Fix initrd-stress.img build

[Daniel P. Berrangé]

On Fri, May 26, 2023 at 10:19:21AM +0200, Paolo Bonzini wrote:
> Queued, thanks.

The second patch looks incomplete to me.


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PATCH 2/2] meson: Add static glib dependency for initrd-stress.img

[Fabiano Rosas]

Daniel P. Berrangé <berrange@redhat.com> writes:

> On Thu, May 25, 2023 at 06:20:44PM -0300, Fabiano Rosas wrote:
>> We recently moved glib detection code to meson but the static libs
>> were left out. Add a specific dependency for stress.c which is linked
>> statically.
>> 
>> $ make V=1 tests/migration/initrd-stress.img
>> 
>> before:
>>  cc -m64 -mcx16 -o tests/migration/stress ... -static -Wl,--start-group
>>  /usr/lib64/libglib-2.0.so -Wl,--end-group
>>  ...
>>  bin/ld: attempted static link of dynamic object `/usr/lib64/libglib-2.0.so'
>> 
>> after:
>>  cc -m64 -mcx16 -o tests/migration/stress ... -static -pthread
>>  -Wl,--start-group -lm /usr/lib64/libpcre.a -lglib-2.0 -Wl,--end-group
>> 
>> Fixes: fc9a809e0d ("build: move glib detection and workarounds to meson")
>> Signed-off-by: Fabiano Rosas <farosas@suse.de>
>> ---
>>  tests/migration/meson.build | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>> 
>> diff --git a/tests/migration/meson.build b/tests/migration/meson.build
>> index dd562355a1..ac71f13290 100644
>> --- a/tests/migration/meson.build
>> +++ b/tests/migration/meson.build
>> @@ -1,9 +1,11 @@
>>  sysprof = dependency('sysprof-capture-4', required: false)
>> +glib_static = dependency('glib-2.0', version: glib_req_ver, required: false,
>> +                         method: 'pkg-config', static: true)
>
> Since required: false, the result might be "not found", which means
> we'll still hit the linker error. I think we need to surround the
> 'executable()' bit in
>
>   if glib_static.found()
>      ...
>   endif
>   

Right, but this time it would be a helpful linker error that would tell
you what you are actually missing. Since this is "build_by_default:
false" I think we're better off letting the error through.