qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Thomas Huth <thuth@redhat.com>
Subject: [PULL 07/21] meson.build: Use -Wno-undef only for SDL2 versions that need it
Date: Tue,  6 Jun 2023 16:31:02 +0200	[thread overview]
Message-ID: <20230606143116.685644-8-pbonzini@redhat.com> (raw)
In-Reply-To: <20230606143116.685644-1-pbonzini@redhat.com>

From: Thomas Huth <thuth@redhat.com>

There is no need to disable this useful compiler warning for
all versions of the SDL. Unfortunately, various versions are
buggy (beside SDL 2.0.8, the version 2.26.0 and 2.26.1 are
broken, too, see https://github.com/libsdl-org/SDL/issues/6619 ),
but we can use a simple compiler check to see whether we need
the -Wno-undef or not.

This also enables the printing of the version number with
good versions of the SDL in the summary of the meson output
again.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230605114523.282987-1-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 meson.build | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/meson.build b/meson.build
index 97b32e9beb5..6bbeffe5711 100644
--- a/meson.build
+++ b/meson.build
@@ -1273,10 +1273,16 @@ if not get_option('sdl').auto() or have_system
   sdl_image = not_found
 endif
 if sdl.found()
-  # work around 2.0.8 bug
-  sdl = declare_dependency(compile_args: '-Wno-undef',
-                           dependencies: sdl,
-                           version: sdl.version())
+  # Some versions of SDL have problems with -Wundef
+  if not cc.compiles('''
+                     #include <SDL.h>
+                     #include <SDL_syswm.h>
+                     int main(int argc, char *argv[]) { return 0; }
+                     ''', dependencies: sdl, args: '-Werror=undef')
+    sdl = declare_dependency(compile_args: '-Wno-undef',
+                             dependencies: sdl,
+                             version: sdl.version())
+  endif
   sdl_image = dependency('SDL2_image', required: get_option('sdl_image'),
                          method: 'pkg-config')
 else
-- 
2.40.1



  parent reply	other threads:[~2023-06-06 14:32 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-06 14:30 [PULL 00/21] (Mostly) build system patches for 2023-06-06 Paolo Bonzini
2023-06-06 14:30 ` [PULL 01/21] meson: Avoid implicit declaration of absent functions Paolo Bonzini
2023-06-06 14:30 ` [PULL 02/21] atomics: eliminate mb_read/mb_set Paolo Bonzini
2023-06-06 14:30 ` [PULL 03/21] scripts: remove dead file Paolo Bonzini
2023-06-06 14:30 ` [PULL 04/21] meson.build: Group the UI entries in a separate summary section Paolo Bonzini
2023-06-06 14:31 ` [PULL 05/21] meson.build: Group the network backend " Paolo Bonzini
2023-06-06 14:31 ` [PULL 06/21] meson.build: Group the audio " Paolo Bonzini
2023-06-06 14:31 ` Paolo Bonzini [this message]
2023-06-06 14:31 ` [PULL 08/21] scsi/qemu-pr-helper: Drop support for 'old' libmultipath API Paolo Bonzini
2023-06-06 14:31 ` [PULL 09/21] Revert "tests/requirements.txt: bump up avocado-framework version to 101.0" Paolo Bonzini
2023-06-06 14:31 ` [PULL 10/21] tests: Use separate virtual environment for avocado Paolo Bonzini
2023-06-06 14:31 ` [PULL 11/21] mkvenv: always pass locally-installed packages to pip Paolo Bonzini
2023-06-06 14:31 ` [PULL 12/21] configure: remove --with-git= option Paolo Bonzini
2023-06-06 14:31 ` [PULL 13/21] configure: rename --enable-pypi to --enable-download, control subprojects too Paolo Bonzini
2023-06-06 14:31 ` [PULL 14/21] git-submodule: allow partial update of .git-submodule-status Paolo Bonzini
2023-07-20 15:08   ` Peter Maydell
2023-06-06 14:31 ` [PULL 15/21] build: log submodule update from git-submodule.sh Paolo Bonzini
2023-06-06 14:31 ` [PULL 16/21] meson: subprojects: replace submodules with wrap files Paolo Bonzini
2023-06-07  1:23   ` Richard Henderson
2023-06-06 14:31 ` [PULL 17/21] configure: move SLOF submodule handling to pc-bios/s390-ccw Paolo Bonzini
2023-06-06 14:31 ` [PULL 18/21] pc-bios/s390-ccw: always build network bootloader Paolo Bonzini
2023-06-06 14:31 ` [PULL 19/21] meson: subprojects: replace berkeley-{soft, test}float-3 with wraps Paolo Bonzini
2023-06-06 14:31 ` [PULL 20/21] build: remove git submodule handling from main makefile Paolo Bonzini
2023-06-06 14:31 ` [PULL 21/21] configure: remove --with-git-submodules= Paolo Bonzini
2023-06-06 19:09 ` [PULL 00/21] (Mostly) build system patches for 2023-06-06 Richard Henderson

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=20230606143116.685644-8-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /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).