meson.build: Use -Wno-undef only for SDL2 versions that need it
PATCH v2 1/1 meson.build: Use -Wno-undef only for SDL2 versions that need it
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.
---
v2: Compile test code instead of hard-coding the version number
meson.build | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
meson.build +10 -4
@@ -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: '-Wundef') + 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
Signature · 1 line
2.31.1
Quoted 7 lines · Thomas Huth
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, seehttps://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.
Quoted 7 lines
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<[email protected]>---
v2: Compile test code instead of hard-coding the version number
r~
Quoted 33 lines · Thomas Huth
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 <[email protected]>---
v2: Compile test code instead of hard-coding the version numbermeson.build | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)meson.build +3
-4@@ -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>
meson.build if not get_option('sdl').auto() or have_system · line 1288
Quoted 10 lines
meson.build +7
-0+ #include <SDL_syswm.h> + int main(int argc, char *argv[]) { return 0; } + ''', dependencies: sdl, args: '-Wundef') + 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
Hmm, there must still be something wrong with this patch, I'm still getting build failures with this in the CI ... no clue why yet, but please disregard this patch.
Thomas
Paolo Bonzini
AppliedQueued, thanks.
Paolo
Quoted 1 line · Paolo Bonzini
Queued, thanks.
Please unqueue it again, I'm still seeing some issues with the patch (not sure why yet):
https://gitlab.com/thuth/qemu/-/jobs/4411089009
Thomas
Quoted 6 lines · Thomas Huth
Quoted 1 line · Paolo Bonzini
Queued, thanks.
Please unqueue it again, I'm still seeing some issues with the patch (not sure why yet):
Yeah, noticed that myself now. :)
Paolo
Quoted 9 lines · Paolo Bonzini
Quoted 7 lines · Paolo Bonzini
Quoted 1 line
Queued, thanks.
Please unqueue it again, I'm still seeing some issues with the patch (not sure why yet):
Yeah, noticed that myself now. 😄
I think all you need is:
meson.build +1 -1
@@ -1345,7 +1345,7 @@ if sdl.found() #include <SDL.h> #include <SDL_syswm.h> int main(int argc, char *argv[]) { return 0; } - ''', dependencies: sdl, args: '-Wundef') + ''', dependencies: sdl, args: ['-Wundef', '-Werror']) sdl = declare_dependency(compile_args: '-Wno-undef', dependencies: sdl, version: sdl.version())
Paolo
Quoted 26 lines · Thomas Huth
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 <[email protected]>---
v2: Compile test code instead of hard-coding the version numbermeson.build | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)meson.build +0
-0@@ -1273,10 +1273,16 @@ if not get_option('sdl').auto() or have_system sdl_image = not_found endif if sdl.found()
meson.build if not get_option('sdl').auto() or have_system · line 1281
Quoted 10 lines
meson.build +6
-4- # 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: '-Wundef')
Don't you need to pass '-Werror' there too, otherwise -Wundef will merely generate an warning and still succeed.
Quoted 10 lines
meson.build +4
-0+ 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') elseSignature · 1 line
2.31.1
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 32 lines · Daniel P. Berrangé
Quoted 31 lines · Thomas Huth
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 <[email protected]>---
v2: Compile test code instead of hard-coding the version numbermeson.build | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)meson.build +1
-4@@ -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
Quoted 8 lines
meson.build if not get_option('sdl').auto() or have_system · line 1281
Quoted 5 lines
meson.build +5
-0+ if not cc.compiles(''' + #include <SDL.h> + #include <SDL_syswm.h> + int main(int argc, char *argv[]) { return 0; } + ''', dependencies: sdl, args: '-Wundef')Don't you need to pass '-Werror' there too, otherwise -Wundef will merely generate an warning and still succeed.
Of course! Thank you very much ... not sure how I could have missed that detail :-/
Thomas