[Qemu-trivial,v3] ivshmem-server: ivshmem-client: Build when eventfd() is available

Commit Message

Kamil Rytarowski June 10, 2017, 3:24 p.m. UTC

On 10.06.2017 17:15, Markus Armbruster wrote:
> Kamil Rytarowski <[e-mail]> writes:
> 
>> On 06.06.2017 16:56, Kamil Rytarowski wrote:
>>> On 06.06.2017 16:34, Peter Maydell wrote:
>>>> On 6 June 2017 at 14:38, Kamil Rytarowski <[e-mail]> wrote:
>>>>> I've linked qemu with the original patch and:
>>>>> ./configure --disable-linux-user --disable-system --static
>>>>>
>>>>> I got some warnings, I think they are originated from our libc and are
>>>>> not related to qemu:
>>>>>   LINK    sparc64-bsd-user/qemu-sparc64
>>>>> /usr/lib/libc.a(initfini.o): warning: common of `__ps_strings'
>>>>> overridden by definition
>>>>> /usr/lib/crt0.o: warning: defined here
>>>>> /usr/lib/libc.a(_env.o): warning: multiple common of `environ'
>>>>> /usr/lib/crt0.o: warning: previous common is here
>>>>> /usr/lib/libc.a(getprogname.o): warning: common of `__progname'
>>>>> overridden by definition
>>>>> /usr/lib/crt0.o: warning: defined here
>>>>
>>>> Yes, I think I've seen those before on NetBSD -- they look
>>>> like a bug in your libc to me, it shouldn't be confusing itself
>>>> with itself like that :-)
>>>>
>>>> thanks
>>>> -- PMM
>>>>
>>>
>>> I have filed this bug upstream: http://gnats.netbsd.org/52278
>>>
>>>
>>
>>
>> What's the status with this patch?
>>
>> NetBSD build still breaks due to ivshmem-*.
> 
> I guess Michael expects a v4 that doesn't break the static build.
> 

-static works for me, I have restricted options to test build on !NetBSD
systems.

Was this patch ok?

Patch

diff --git a/Makefile b/Makefile
index c830d7a..2ef5a78 100644
--- a/Makefile
+++ b/Makefile
@@ -469,10 +469,12 @@  ifneq ($(EXESUF),)
 qemu-ga: qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI)
 endif

+ifdef CONFIG_IVSHMEM
 ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_LDADDS)
 	$(call LINK, $^)
 ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)
 	$(call LINK, $^)
+endif


So I could amend it.