[Qemu-devel] [PATCH] build-sys: remove slirp cflags from main-loop.o

Marc-André Lureau posted 1 patch 4 years, 8 months ago
Test FreeBSD passed
Test asan passed
Test docker-mingw@fedora passed
Test docker-clang@ubuntu passed
Test checkpatch passed
Test s390x passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20190712172743.17632-1-marcandre.lureau@redhat.com
util/Makefile.objs | 1 -
1 file changed, 1 deletion(-)
[Qemu-devel] [PATCH] build-sys: remove slirp cflags from main-loop.o
Posted by Marc-André Lureau 4 years, 8 months ago
Left over from c2d63650d962612cfa1b21302782d4cd12142c74.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 util/Makefile.objs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/util/Makefile.objs b/util/Makefile.objs
index 38178201ff..68af3cd5e9 100644
--- a/util/Makefile.objs
+++ b/util/Makefile.objs
@@ -3,7 +3,6 @@ util-obj-y += bufferiszero.o
 util-obj-y += lockcnt.o
 util-obj-y += aiocb.o async.o aio-wait.o thread-pool.o qemu-timer.o
 util-obj-y += main-loop.o iohandler.o
-main-loop.o-cflags := $(SLIRP_CFLAGS)
 util-obj-$(call lnot,$(CONFIG_ATOMIC64)) += atomic64.o
 util-obj-$(CONFIG_POSIX) += aio-posix.o
 util-obj-$(CONFIG_POSIX) += compatfd.o
-- 
2.22.0.428.g6d5b264208


Re: [Qemu-devel] [PATCH] build-sys: remove slirp cflags from main-loop.o
Posted by Philippe Mathieu-Daudé 4 years, 8 months ago
Hi Marc-André,

On 7/12/19 7:27 PM, Marc-André Lureau wrote:
> Left over from c2d63650d962612cfa1b21302782d4cd12142c74.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---
>  util/Makefile.objs | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/util/Makefile.objs b/util/Makefile.objs
> index 38178201ff..68af3cd5e9 100644
> --- a/util/Makefile.objs
> +++ b/util/Makefile.objs
> @@ -3,7 +3,6 @@ util-obj-y += bufferiszero.o
>  util-obj-y += lockcnt.o
>  util-obj-y += aiocb.o async.o aio-wait.o thread-pool.o qemu-timer.o
>  util-obj-y += main-loop.o iohandler.o
> -main-loop.o-cflags := $(SLIRP_CFLAGS)
>  util-obj-$(call lnot,$(CONFIG_ATOMIC64)) += atomic64.o
>  util-obj-$(CONFIG_POSIX) += aio-posix.o
>  util-obj-$(CONFIG_POSIX) += compatfd.o
> 

Since you are looking at slirp, I'm having a bunch of:

$ make help
[...]
  CC      slirp/src/tftp.o
Package glib-2.0 was not found in the pkg-config search path.
Perhaps you should add the directory containing `glib-2.0.pc'
to the PKG_CONFIG_PATH environment variable
No package 'glib-2.0' found
  CC      slirp/src/udp6.o
Package glib-2.0 was not found in the pkg-config search path.
Perhaps you should add the directory containing `glib-2.0.pc'
to the PKG_CONFIG_PATH environment variable
No package 'glib-2.0' found
[...]

On MinGW.

I can silent the warnings using (32-git build):

PKG_CONFIG_PATH=/usr/lib/mxe/usr/i686-w64-mingw32.shared/lib/pkgconfig

This is new since the slirp split.

Any idea where to fix that?

Thanks,

Phil.

Re: [Qemu-devel] [PATCH] build-sys: remove slirp cflags from main-loop.o
Posted by Marc-André Lureau 4 years, 8 months ago
Hi

On Fri, Jul 12, 2019 at 9:37 PM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
>
> Hi Marc-André,
>
> On 7/12/19 7:27 PM, Marc-André Lureau wrote:
> > Left over from c2d63650d962612cfa1b21302782d4cd12142c74.
> >
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> > ---
> >  util/Makefile.objs | 1 -
> >  1 file changed, 1 deletion(-)
> >
> > diff --git a/util/Makefile.objs b/util/Makefile.objs
> > index 38178201ff..68af3cd5e9 100644
> > --- a/util/Makefile.objs
> > +++ b/util/Makefile.objs
> > @@ -3,7 +3,6 @@ util-obj-y += bufferiszero.o
> >  util-obj-y += lockcnt.o
> >  util-obj-y += aiocb.o async.o aio-wait.o thread-pool.o qemu-timer.o
> >  util-obj-y += main-loop.o iohandler.o
> > -main-loop.o-cflags := $(SLIRP_CFLAGS)
> >  util-obj-$(call lnot,$(CONFIG_ATOMIC64)) += atomic64.o
> >  util-obj-$(CONFIG_POSIX) += aio-posix.o
> >  util-obj-$(CONFIG_POSIX) += compatfd.o
> >
>
> Since you are looking at slirp, I'm having a bunch of:
>
> $ make help
> [...]
>   CC      slirp/src/tftp.o
> Package glib-2.0 was not found in the pkg-config search path.
> Perhaps you should add the directory containing `glib-2.0.pc'
> to the PKG_CONFIG_PATH environment variable
> No package 'glib-2.0' found
>   CC      slirp/src/udp6.o
> Package glib-2.0 was not found in the pkg-config search path.
> Perhaps you should add the directory containing `glib-2.0.pc'
> to the PKG_CONFIG_PATH environment variable
> No package 'glib-2.0' found
> [...]
>
> On MinGW.

On "cross-mingw" I suppose

> I can silent the warnings using (32-git build):
>
> PKG_CONFIG_PATH=/usr/lib/mxe/usr/i686-w64-mingw32.shared/lib/pkgconfig

Hmm that looks like a pkg-config configuration issue to me.

>
> This is new since the slirp split.
>
> Any idea where to fix that?
>

Compile and install libslirp shared lib, ./configure --enable-slirp=system :)

Btw, I wonder if we can already warn about deprecation of
--enable-slirp=git. Peter is that too early for 4.1? (first libslirp
was released last month)


-- 
Marc-André Lureau

Re: [Qemu-devel] [PATCH] build-sys: remove slirp cflags from main-loop.o
Posted by Paolo Bonzini 4 years, 8 months ago
On 12/07/19 19:46, Marc-André Lureau wrote:
> Hi
> 
> On Fri, Jul 12, 2019 at 9:37 PM Philippe Mathieu-Daudé
> <philmd@redhat.com> wrote:
>>
>> Hi Marc-André,
>>
>> On 7/12/19 7:27 PM, Marc-André Lureau wrote:
>>> Left over from c2d63650d962612cfa1b21302782d4cd12142c74.
>>>
>>> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>>
>> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>
>>> ---
>>>  util/Makefile.objs | 1 -
>>>  1 file changed, 1 deletion(-)
>>>
>>> diff --git a/util/Makefile.objs b/util/Makefile.objs
>>> index 38178201ff..68af3cd5e9 100644
>>> --- a/util/Makefile.objs
>>> +++ b/util/Makefile.objs
>>> @@ -3,7 +3,6 @@ util-obj-y += bufferiszero.o
>>>  util-obj-y += lockcnt.o
>>>  util-obj-y += aiocb.o async.o aio-wait.o thread-pool.o qemu-timer.o
>>>  util-obj-y += main-loop.o iohandler.o
>>> -main-loop.o-cflags := $(SLIRP_CFLAGS)
>>>  util-obj-$(call lnot,$(CONFIG_ATOMIC64)) += atomic64.o
>>>  util-obj-$(CONFIG_POSIX) += aio-posix.o
>>>  util-obj-$(CONFIG_POSIX) += compatfd.o
>>>
>>
>> Since you are looking at slirp, I'm having a bunch of:
>>
>> $ make help
>> [...]
>>   CC      slirp/src/tftp.o
>> Package glib-2.0 was not found in the pkg-config search path.
>> Perhaps you should add the directory containing `glib-2.0.pc'
>> to the PKG_CONFIG_PATH environment variable
>> No package 'glib-2.0' found
>>   CC      slirp/src/udp6.o
>> Package glib-2.0 was not found in the pkg-config search path.
>> Perhaps you should add the directory containing `glib-2.0.pc'
>> to the PKG_CONFIG_PATH environment variable
>> No package 'glib-2.0' found
>> [...]
>>
>> On MinGW.
> 
> On "cross-mingw" I suppose
> 
>> I can silent the warnings using (32-git build):
>>
>> PKG_CONFIG_PATH=/usr/lib/mxe/usr/i686-w64-mingw32.shared/lib/pkgconfig
> 
> Hmm that looks like a pkg-config configuration issue to me.
> 
>>
>> This is new since the slirp split.
>>
>> Any idea where to fix that?
>>
> 
> Compile and install libslirp shared lib, ./configure --enable-slirp=system :)
> 
> Btw, I wonder if we can already warn about deprecation of
> --enable-slirp=git. Peter is that too early for 4.1? (first libslirp
> was released last month)

Yeah, I think we should let a year pass or so.

Paolo


Re: [Qemu-devel] [PATCH] build-sys: remove slirp cflags from main-loop.o
Posted by Paolo Bonzini 4 years, 8 months ago
On 12/07/19 19:27, Marc-André Lureau wrote:
> Left over from c2d63650d962612cfa1b21302782d4cd12142c74.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  util/Makefile.objs | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/util/Makefile.objs b/util/Makefile.objs
> index 38178201ff..68af3cd5e9 100644
> --- a/util/Makefile.objs
> +++ b/util/Makefile.objs
> @@ -3,7 +3,6 @@ util-obj-y += bufferiszero.o
>  util-obj-y += lockcnt.o
>  util-obj-y += aiocb.o async.o aio-wait.o thread-pool.o qemu-timer.o
>  util-obj-y += main-loop.o iohandler.o
> -main-loop.o-cflags := $(SLIRP_CFLAGS)
>  util-obj-$(call lnot,$(CONFIG_ATOMIC64)) += atomic64.o
>  util-obj-$(CONFIG_POSIX) += aio-posix.o
>  util-obj-$(CONFIG_POSIX) += compatfd.o
> 

Queued, thanks.

Paolo