OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

meson: Fix targetos match for illumos and Solaris.

Browse Source 
qemu 8.1.0 breaks on illumos platforms due to _XOPEN_SOURCE and others no longer being set correctly, leading to breakage such as:

  https://us-central.manta.mnx.io/pkgsrc/public/reports/trunk/tools/20230908.1404/qemu-8.1.0/build.log

This is a result of meson conversion which incorrectly matches against 'solaris' instead of 'sunos' for uname.

First time submitting a patch here, hope I did it correctly.  Thanks.

Signed-off-by: Jonathan Perkin <jonathan@perkin.org.uk>
Message-ID: <ZPtdxtum9UVPy58J@perkin.org.uk>
Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Jonathan Perkin 2023-09-08 18:45:42 +01:00 committed by Paolo Bonzini
parent 9ef497755a
commit fb0a8b0e23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -226,7 +226,7 @@ if targetos == 'darwin'
if compiler.get_id() == 'gcc' if compiler.get_id() == 'gcc'
qemu_common_flags += '-DOS_OBJECT_USE_OBJC=0' qemu_common_flags += '-DOS_OBJECT_USE_OBJC=0'
endif endif
elif targetos == 'solaris' elif targetos == 'sunos'
# needed for CMSG_ macros in sys/socket.h # needed for CMSG_ macros in sys/socket.h
qemu_common_flags += '-D_XOPEN_SOURCE=600' qemu_common_flags += '-D_XOPEN_SOURCE=600'
# needed for TIOCWIN* defines in termios.h # needed for TIOCWIN* defines in termios.h
@ -2048,7 +2048,7 @@ have_slirp_smbd = get_option('slirp_smbd') \
if have_slirp_smbd if have_slirp_smbd
smbd_path = get_option('smbd') smbd_path = get_option('smbd')
if smbd_path == '' if smbd_path == ''
smbd_path = (targetos == 'solaris' ? '/usr/sfw/sbin/smbd' : '/usr/sbin/smbd') smbd_path = (targetos == 'sunos' ? '/usr/sfw/sbin/smbd' : '/usr/sbin/smbd')
endif endif
config_host_data.set_quoted('CONFIG_SMBD_COMMAND', smbd_path) config_host_data.set_quoted('CONFIG_SMBD_COMMAND', smbd_path)
endif endif

2
net/meson.build
View File

@ -47,7 +47,7 @@ elif targetos == 'linux'
system_ss.add(files('tap.c', 'tap-linux.c')) system_ss.add(files('tap.c', 'tap-linux.c'))
elif targetos in bsd_oses elif targetos in bsd_oses
system_ss.add(files('tap.c', 'tap-bsd.c')) system_ss.add(files('tap.c', 'tap-bsd.c'))
elif targetos == 'solaris' elif targetos == 'sunos'
system_ss.add(files('tap.c', 'tap-solaris.c')) system_ss.add(files('tap.c', 'tap-solaris.c'))
else else
system_ss.add(files('tap.c', 'tap-stub.c')) system_ss.add(files('tap.c', 'tap-stub.c'))