libvhost-user: add a link-static option

[PATCH] libvhost-user: add a link-static option

Posted by marcandre.lureau@redhat.com 3 years, 4 months ago

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

Fix linking vhost-user binaries with with ./configure -static.

Fixes: 0df750e9d3a5fea5e1 ("libvhost-user: make it a meson subproject")
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 configure                                   | 1 +
 subprojects/libvhost-user/meson.build       | 3 ++-
 subprojects/libvhost-user/meson_options.txt | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 subprojects/libvhost-user/meson_options.txt

diff --git a/configure b/configure
index 18c26e0389..465f7bb150 100755
--- a/configure
+++ b/configure
@@ -7014,6 +7014,7 @@ NINJA=$ninja $meson setup \
         -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\
         -Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \
         -Dvhost_user_blk_server=$vhost_user_blk_server \
+        -Dlibvhost-user:link-static=$(if test "$static" = yes; then echo true; else echo false; fi) \
         $cross_arg \
         "$PWD" "$source_path"
 
diff --git a/subprojects/libvhost-user/meson.build b/subprojects/libvhost-user/meson.build
index c5d85c11d7..5a9cc8675e 100644
--- a/subprojects/libvhost-user/meson.build
+++ b/subprojects/libvhost-user/meson.build
@@ -2,7 +2,8 @@ project('libvhost-user', 'c',
         license: 'GPL-2.0-or-later',
         default_options: ['c_std=gnu99'])
 
-glib = dependency('glib-2.0')
+link_static = get_option('link-static')
+glib = dependency('glib-2.0', static: link_static)
 inc = include_directories('../../include', '../../linux-headers')
 
 vhost_user = static_library('vhost-user',
diff --git a/subprojects/libvhost-user/meson_options.txt b/subprojects/libvhost-user/meson_options.txt
new file mode 100644
index 0000000000..03fe088e36
--- /dev/null
+++ b/subprojects/libvhost-user/meson_options.txt
@@ -0,0 +1,5 @@
+option('link-static',
+  type: 'boolean',
+  value: false,
+)
+
-- 
2.29.0

Re: [PATCH] libvhost-user: add a link-static option

Posted by Paolo Bonzini 3 years, 4 months ago

On 12/12/20 10:08, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> Fix linking vhost-user binaries with with ./configure -static.
> 
> Fixes: 0df750e9d3a5fea5e1 ("libvhost-user: make it a meson subproject")
> Reported-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>   configure                                   | 1 +
>   subprojects/libvhost-user/meson.build       | 3 ++-
>   subprojects/libvhost-user/meson_options.txt | 5 +++++
>   3 files changed, 8 insertions(+), 1 deletion(-)
>   create mode 100644 subprojects/libvhost-user/meson_options.txt
> 
> diff --git a/configure b/configure
> index 18c26e0389..465f7bb150 100755
> --- a/configure
> +++ b/configure
> @@ -7014,6 +7014,7 @@ NINJA=$ninja $meson setup \
>           -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\
>           -Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \
>           -Dvhost_user_blk_server=$vhost_user_blk_server \
> +        -Dlibvhost-user:link-static=$(if test "$static" = yes; then echo true; else echo false; fi) \
>           $cross_arg \
>           "$PWD" "$source_path"
>   
> diff --git a/subprojects/libvhost-user/meson.build b/subprojects/libvhost-user/meson.build
> index c5d85c11d7..5a9cc8675e 100644
> --- a/subprojects/libvhost-user/meson.build
> +++ b/subprojects/libvhost-user/meson.build
> @@ -2,7 +2,8 @@ project('libvhost-user', 'c',
>           license: 'GPL-2.0-or-later',
>           default_options: ['c_std=gnu99'])
>   
> -glib = dependency('glib-2.0')
> +link_static = get_option('link-static')
> +glib = dependency('glib-2.0', static: link_static)
>   inc = include_directories('../../include', '../../linux-headers')
>   
>   vhost_user = static_library('vhost-user',
> diff --git a/subprojects/libvhost-user/meson_options.txt b/subprojects/libvhost-user/meson_options.txt
> new file mode 100644
> index 0000000000..03fe088e36
> --- /dev/null
> +++ b/subprojects/libvhost-user/meson_options.txt
> @@ -0,0 +1,5 @@
> +option('link-static',
> +  type: 'boolean',
> +  value: false,
> +)
> +

No, this is wrong.  We need to use the results of the configure test 
uniformly until we can move it to meson.build.

Ask yourself if you'd like to have this option in a standalone project, 
the answer most likely is no...  Can you use override_dependency from 
the toplevel meson.build instead?  It's usually meant for 
sub->superproject, but we can use it in this case as well I think.

Paolo

Re: [PATCH] libvhost-user: add a link-static option

Posted by Marc-André Lureau 3 years, 4 months ago

On Mon, Dec 14, 2020 at 8:23 PM Paolo Bonzini <pbonzini@redhat.com> wrote:

> On 12/12/20 10:08, marcandre.lureau@redhat.com wrote:
> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
> > Fix linking vhost-user binaries with with ./configure -static.
> >
> > Fixes: 0df750e9d3a5fea5e1 ("libvhost-user: make it a meson subproject")
> > Reported-by: Peter Maydell <peter.maydell@linaro.org>
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > ---
> >   configure                                   | 1 +
> >   subprojects/libvhost-user/meson.build       | 3 ++-
> >   subprojects/libvhost-user/meson_options.txt | 5 +++++
> >   3 files changed, 8 insertions(+), 1 deletion(-)
> >   create mode 100644 subprojects/libvhost-user/meson_options.txt
> >
> > diff --git a/configure b/configure
> > index 18c26e0389..465f7bb150 100755
> > --- a/configure
> > +++ b/configure
> > @@ -7014,6 +7014,7 @@ NINJA=$ninja $meson setup \
> >           -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\
> >           -Ddocs=$docs -Dsphinx_build=$sphinx_build
> -Dinstall_blobs=$blobs \
> >           -Dvhost_user_blk_server=$vhost_user_blk_server \
> > +        -Dlibvhost-user:link-static=$(if test "$static" = yes; then
> echo true; else echo false; fi) \
> >           $cross_arg \
> >           "$PWD" "$source_path"
> >
> > diff --git a/subprojects/libvhost-user/meson.build
> b/subprojects/libvhost-user/meson.build
> > index c5d85c11d7..5a9cc8675e 100644
> > --- a/subprojects/libvhost-user/meson.build
> > +++ b/subprojects/libvhost-user/meson.build
> > @@ -2,7 +2,8 @@ project('libvhost-user', 'c',
> >           license: 'GPL-2.0-or-later',
> >           default_options: ['c_std=gnu99'])
> >
> > -glib = dependency('glib-2.0')
> > +link_static = get_option('link-static')
> > +glib = dependency('glib-2.0', static: link_static)
> >   inc = include_directories('../../include', '../../linux-headers')
> >
> >   vhost_user = static_library('vhost-user',
> > diff --git a/subprojects/libvhost-user/meson_options.txt
> b/subprojects/libvhost-user/meson_options.txt
> > new file mode 100644
> > index 0000000000..03fe088e36
> > --- /dev/null
> > +++ b/subprojects/libvhost-user/meson_options.txt
> > @@ -0,0 +1,5 @@
> > +option('link-static',
> > +  type: 'boolean',
> > +  value: false,
> > +)
> > +
>
> No, this is wrong.  We need to use the results of the configure test
> uniformly until we can move it to meson.build.
>
> Ask yourself if you'd like to have this option in a standalone project,
>

I took the option from a meson test case:
https://github.com/mesonbuild/meson/blob/master/test%20cases/frameworks/15%20llvm/meson.build

the answer most likely is no...  Can you use override_dependency from
> the toplevel meson.build instead?  It's usually meant for
> sub->superproject, but we can use it in this case as well I think.
>
>
ok I'll try


-- 
Marc-André Lureau

Re: [PATCH] libvhost-user: add a link-static option

Posted by Marc-André Lureau 3 years, 4 months ago

On Mon, Dec 14, 2020 at 9:07 PM Marc-André Lureau <
marcandre.lureau@gmail.com> wrote:

>
>
> On Mon, Dec 14, 2020 at 8:23 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
>> On 12/12/20 10:08, marcandre.lureau@redhat.com wrote:
>> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
>> >
>> > Fix linking vhost-user binaries with with ./configure -static.
>> >
>> > Fixes: 0df750e9d3a5fea5e1 ("libvhost-user: make it a meson subproject")
>> > Reported-by: Peter Maydell <peter.maydell@linaro.org>
>> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>> > ---
>> >   configure                                   | 1 +
>> >   subprojects/libvhost-user/meson.build       | 3 ++-
>> >   subprojects/libvhost-user/meson_options.txt | 5 +++++
>> >   3 files changed, 8 insertions(+), 1 deletion(-)
>> >   create mode 100644 subprojects/libvhost-user/meson_options.txt
>> >
>> > diff --git a/configure b/configure
>> > index 18c26e0389..465f7bb150 100755
>> > --- a/configure
>> > +++ b/configure
>> > @@ -7014,6 +7014,7 @@ NINJA=$ninja $meson setup \
>> >           -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\
>> >           -Ddocs=$docs -Dsphinx_build=$sphinx_build
>> -Dinstall_blobs=$blobs \
>> >           -Dvhost_user_blk_server=$vhost_user_blk_server \
>> > +        -Dlibvhost-user:link-static=$(if test "$static" = yes; then
>> echo true; else echo false; fi) \
>> >           $cross_arg \
>> >           "$PWD" "$source_path"
>> >
>> > diff --git a/subprojects/libvhost-user/meson.build
>> b/subprojects/libvhost-user/meson.build
>> > index c5d85c11d7..5a9cc8675e 100644
>> > --- a/subprojects/libvhost-user/meson.build
>> > +++ b/subprojects/libvhost-user/meson.build
>> > @@ -2,7 +2,8 @@ project('libvhost-user', 'c',
>> >           license: 'GPL-2.0-or-later',
>> >           default_options: ['c_std=gnu99'])
>> >
>> > -glib = dependency('glib-2.0')
>> > +link_static = get_option('link-static')
>> > +glib = dependency('glib-2.0', static: link_static)
>> >   inc = include_directories('../../include', '../../linux-headers')
>> >
>> >   vhost_user = static_library('vhost-user',
>> > diff --git a/subprojects/libvhost-user/meson_options.txt
>> b/subprojects/libvhost-user/meson_options.txt
>> > new file mode 100644
>> > index 0000000000..03fe088e36
>> > --- /dev/null
>> > +++ b/subprojects/libvhost-user/meson_options.txt
>> > @@ -0,0 +1,5 @@
>> > +option('link-static',
>> > +  type: 'boolean',
>> > +  value: false,
>> > +)
>> > +
>>
>> No, this is wrong.  We need to use the results of the configure test
>> uniformly until we can move it to meson.build.
>>
>> Ask yourself if you'd like to have this option in a standalone project,
>>
>
> I took the option from a meson test case:
>
> https://github.com/mesonbuild/meson/blob/master/test%20cases/frameworks/15%20llvm/meson.build
>
> the answer most likely is no...  Can you use override_dependency from
>> the toplevel meson.build instead?  It's usually meant for
>> sub->superproject, but we can use it in this case as well I think.
>>
>>
> ok I'll try
>
>
Adding:
 meson.override_dependency('glib-2.0', dependency('glib-2.0', static:
enable_static))

just before the "vhost_user = not_found..." works. Is that what you had in
mind?


> --
> Marc-André Lureau
>


-- 
Marc-André Lureau

Re: [PATCH] libvhost-user: add a link-static option

Posted by Paolo Bonzini 3 years, 4 months ago

Il lun 14 dic 2020, 21:48 Marc-André Lureau <marcandre.lureau@gmail.com> ha
scritto:

> Adding:
>  meson.override_dependency('glib-2.0', dependency('glib-2.0', static:
> enable_static))
>
> just before the "vhost_user = not_found..." works. Is that what you had in
> mind?
>

Why not "meson.override_dependency('glib-2.0', glib)", either there before
the vhost_user assignmeny or in meson.build where glib is assigned to?

Thanks,

Paolo

>
>
>> --
>> Marc-André Lureau
>>
>
>
> --
> Marc-André Lureau
>