* [PATCH] meson.build: tweak sdl-image error message
@ 2020-09-08 7:40 Sergei Trofimovich
2020-09-08 7:49 ` Philippe Mathieu-Daudé
2020-09-08 8:24 ` Paolo Bonzini
0 siblings, 2 replies; 4+ messages in thread
From: Sergei Trofimovich @ 2020-09-08 7:40 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Philippe Mathieu-Daudé, Rafael Kitover,
Sergei Trofimovich, Marc-André Lureau
Before the change missing SDL was reported as:
../meson.build:253:4: ERROR: Expected 1 arguments, got 2.
After the error as:
../meson.build:258:4: ERROR: Problem encountered: sdl-image required, but SDL was not found
CC: Paolo Bonzini <pbonzini@redhat.com>
CC: "Marc-André Lureau" <marcandre.lureau@redhat.com>
CC: "Philippe Mathieu-Daudé" <philmd@redhat.com>
CC: Rafael Kitover <rkitover@gmail.com>
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 04e070bb3b..7fd2a903c5 100644
--- a/meson.build
+++ b/meson.build
@@ -255,8 +255,8 @@ if sdl.found()
method: 'pkg-config', static: enable_static)
else
if get_option('sdl_image').enabled()
- error('sdl-image required, but SDL was @0@',
- get_option('sdl').disabled() ? 'disabled' : 'not found')
+ error('sdl-image required, but SDL was @0@'.format(
+ get_option('sdl').disabled() ? 'disabled' : 'not found'))
endif
sdl_image = not_found
endif
--
2.28.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] meson.build: tweak sdl-image error message
2020-09-08 7:40 [PATCH] meson.build: tweak sdl-image error message Sergei Trofimovich
@ 2020-09-08 7:49 ` Philippe Mathieu-Daudé
2020-09-08 8:24 ` Paolo Bonzini
1 sibling, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-09-08 7:49 UTC (permalink / raw)
To: Sergei Trofimovich, qemu-devel
Cc: Paolo Bonzini, Rafael Kitover, Marc-André Lureau
On 9/8/20 9:40 AM, Sergei Trofimovich wrote:
> Before the change missing SDL was reported as:
>
> ../meson.build:253:4: ERROR: Expected 1 arguments, got 2.
>
> After the error as:
>
> ../meson.build:258:4: ERROR: Problem encountered: sdl-image required, but SDL was not found
>
> CC: Paolo Bonzini <pbonzini@redhat.com>
> CC: "Marc-André Lureau" <marcandre.lureau@redhat.com>
> CC: "Philippe Mathieu-Daudé" <philmd@redhat.com>
> CC: Rafael Kitover <rkitover@gmail.com>
> Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> meson.build | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 04e070bb3b..7fd2a903c5 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -255,8 +255,8 @@ if sdl.found()
> method: 'pkg-config', static: enable_static)
> else
> if get_option('sdl_image').enabled()
> - error('sdl-image required, but SDL was @0@',
> - get_option('sdl').disabled() ? 'disabled' : 'not found')
> + error('sdl-image required, but SDL was @0@'.format(
> + get_option('sdl').disabled() ? 'disabled' : 'not found'))
> endif
> sdl_image = not_found
> endif
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] meson.build: tweak sdl-image error message
2020-09-08 7:40 [PATCH] meson.build: tweak sdl-image error message Sergei Trofimovich
2020-09-08 7:49 ` Philippe Mathieu-Daudé
@ 2020-09-08 8:24 ` Paolo Bonzini
2020-09-09 15:31 ` Laurent Vivier
1 sibling, 1 reply; 4+ messages in thread
From: Paolo Bonzini @ 2020-09-08 8:24 UTC (permalink / raw)
To: Sergei Trofimovich
Cc: qemu-trivial, Marc-André Lureau, Philippe Mathieu-Daudé,
qemu-devel, Rafael Kitover
[-- Attachment #1: Type: text/plain, Size: 1318 bytes --]
Cc: qemu-trivial@nongnu.org
Il mar 8 set 2020, 09:50 Sergei Trofimovich <slyfox@gentoo.org> ha scritto:
> Before the change missing SDL was reported as:
>
> ../meson.build:253:4: ERROR: Expected 1 arguments, got 2.
>
> After the error as:
>
> ../meson.build:258:4: ERROR: Problem encountered: sdl-image required,
> but SDL was not found
>
> CC: Paolo Bonzini <pbonzini@redhat.com>
> CC: "Marc-André Lureau" <marcandre.lureau@redhat.com>
> CC: "Philippe Mathieu-Daudé" <philmd@redhat.com>
> CC: Rafael Kitover <rkitover@gmail.com>
> Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
> ---
> meson.build | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 04e070bb3b..7fd2a903c5 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -255,8 +255,8 @@ if sdl.found()
> method: 'pkg-config', static: enable_static)
> else
> if get_option('sdl_image').enabled()
> - error('sdl-image required, but SDL was @0@',
> - get_option('sdl').disabled() ? 'disabled' : 'not found')
> + error('sdl-image required, but SDL was @0@'.format(
> + get_option('sdl').disabled() ? 'disabled' : 'not found'))
> endif
> sdl_image = not_found
> endif
> --
> 2.28.0
>
>
[-- Attachment #2: Type: text/html, Size: 2233 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] meson.build: tweak sdl-image error message
2020-09-08 8:24 ` Paolo Bonzini
@ 2020-09-09 15:31 ` Laurent Vivier
0 siblings, 0 replies; 4+ messages in thread
From: Laurent Vivier @ 2020-09-09 15:31 UTC (permalink / raw)
To: Paolo Bonzini, Sergei Trofimovich
Cc: qemu-trivial, Marc-André Lureau, Philippe Mathieu-Daudé,
qemu-devel, Rafael Kitover
Le 08/09/2020 à 10:24, Paolo Bonzini a écrit :
> Cc: qemu-trivial@nongnu.org <mailto:qemu-trivial@nongnu.org>
>
> Il mar 8 set 2020, 09:50 Sergei Trofimovich <slyfox@gentoo.org
> <mailto:slyfox@gentoo.org>> ha scritto:
>
> Before the change missing SDL was reported as:
>
> ../meson.build:253:4: ERROR: Expected 1 arguments, got 2.
>
> After the error as:
>
> ../meson.build:258:4: ERROR: Problem encountered: sdl-image
> required, but SDL was not found
>
> CC: Paolo Bonzini <pbonzini@redhat.com <mailto:pbonzini@redhat.com>>
> CC: "Marc-André Lureau" <marcandre.lureau@redhat.com
> <mailto:marcandre.lureau@redhat.com>>
> CC: "Philippe Mathieu-Daudé" <philmd@redhat.com
> <mailto:philmd@redhat.com>>
> CC: Rafael Kitover <rkitover@gmail.com <mailto:rkitover@gmail.com>>
> Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org
> <mailto:slyfox@gentoo.org>>
> ---
> meson.build | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 04e070bb3b..7fd2a903c5 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -255,8 +255,8 @@ if sdl.found()
> method: 'pkg-config', static: enable_static)
> else
> if get_option('sdl_image').enabled()
> - error('sdl-image required, but SDL was @0@',
> - get_option('sdl').disabled() ? 'disabled' : 'not found')
> + error('sdl-image required, but SDL was @0@'.format(
> + get_option('sdl').disabled() ? 'disabled' : 'not found'))
> endif
> sdl_image = not_found
> endif
> --
> 2.28.0
>
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-09 15:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-08 7:40 [PATCH] meson.build: tweak sdl-image error message Sergei Trofimovich
2020-09-08 7:49 ` Philippe Mathieu-Daudé
2020-09-08 8:24 ` Paolo Bonzini
2020-09-09 15:31 ` Laurent Vivier
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).