Re: [PULL 00/30] Misc mostly build system patches for 2022-02-15

[Paolo Bonzini <pbonzini@redhat.com>]

On 2/16/22 15:41, Peter Maydell wrote:
> On Wed, 16 Feb 2022 at 14:03, Paolo Bonzini <pbonzini@redhat.com> wrote:
>>
>> On 2/16/22 10:56, Peter Maydell wrote:
>>> Hi; this fails to build on OpenBSD (on the tests/vm/ setup).
>>>
>>> Meson thinks it's found OpenGL:
>>>       OpenGL support (epoxy)       : YES 1.5.4
>>>
>>> but either it's wrong or else it's not putting the right
>>> include directory onto the path, because the compiler
>>> fails to find the headers:
>>>
>>> In file included from ../src/hw/arm/virt.c:42:
>>> In file included from
>>> /home/qemu/qemu-test.sr5128/src/include/hw/vfio/vfio-calxeda-xgmac.h:17:
>>> In file included from
>>> /home/qemu/qemu-test.sr5128/src/include/hw/vfio/vfio-platform.h:20:
>>> In file included from
>>> /home/qemu/qemu-test.sr5128/src/include/hw/vfio/vfio-common.h:27:
>>> /home/qemu/qemu-test.sr5128/src/include/ui/console.h:11:11: fatal
>>> error: 'epoxy/gl.h' file not found
>>> # include <epoxy/gl.h>
>>>             ^~~~~~~~~~~~
>>> 1 error generated.
>>
>> Yeah, there's a lot of uses of ui/console.h and they all need
>> epoxy/gl.h.  That's in need of some cleanup.
> 
> Why can't meson just do the same thing configure was doing,
> ie add the include path to the cflags and the library path
> to the linker flags?

Yes, it can do that as well.  I found it now:

@@ -43,7 +43,6 @@ vnc_ss.add(zlib, png, jpeg, gnutls)
  vnc_ss.add(when: sasl, if_true: files('vnc-auth-sasl.c'))
  softmmu_ss.add_all(when: vnc, if_true: vnc_ss)
  softmmu_ss.add(when: vnc, if_false: files('vnc-stubs.c'))
-specific_ss.add(when: ['CONFIG_SOFTMMU'], if_true: opengl)

  ui_modules = {}


Paolo