qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Perkin <jonathan@perkin.org.uk>
To: qemu-devel@nongnu.org
Subject: [PATCH] meson: Fix targetos match for illumos and Solaris.
Date: Fri, 8 Sep 2023 18:45:42 +0100	[thread overview]
Message-ID: <ZPtdxtum9UVPy58J@perkin.org.uk> (raw)

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>
---
  meson.build     | 4 ++--
  net/meson.build | 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index 0e31bdfabf..5150a74831 100644
--- a/meson.build
+++ b/meson.build
@@ -226,7 +226,7 @@ if targetos == 'darwin'
    if compiler.get_id() == 'gcc'
      qemu_common_flags += '-DOS_OBJECT_USE_OBJC=0'
    endif
-elif targetos == 'solaris'
+elif targetos == 'sunos'
    # needed for CMSG_ macros in sys/socket.h
    qemu_common_flags += '-D_XOPEN_SOURCE=600'
    # needed for TIOCWIN* defines in termios.h
@@ -2048,7 +2048,7 @@ have_slirp_smbd = get_option('slirp_smbd') \
  if have_slirp_smbd
    smbd_path = get_option('smbd')
    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
    config_host_data.set_quoted('CONFIG_SMBD_COMMAND', smbd_path)
  endif
diff --git a/net/meson.build b/net/meson.build
index d2d70634e5..51caa42c9d 100644
--- a/net/meson.build
+++ b/net/meson.build
@@ -47,7 +47,7 @@ elif targetos == 'linux'
    system_ss.add(files('tap.c', 'tap-linux.c'))
  elif targetos in bsd_oses
    system_ss.add(files('tap.c', 'tap-bsd.c'))
-elif targetos == 'solaris'
+elif targetos == 'sunos'
    system_ss.add(files('tap.c', 'tap-solaris.c'))
  else
    system_ss.add(files('tap.c', 'tap-stub.c'))
-- 
2.42.0



             reply	other threads:[~2023-09-08 21:08 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-08 17:45 Jonathan Perkin [this message]
2023-09-10  6:45 ` [PATCH] meson: Fix targetos match for illumos and Solaris Paolo Bonzini
2023-09-11  9:28 ` Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ZPtdxtum9UVPy58J@perkin.org.uk \
    --to=jonathan@perkin.org.uk \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).