meson.build: tweak sdl-image error message

[PATCH] meson.build: tweak sdl-image error message

Posted by Sergei Trofimovich 3 years, 7 months ago

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

Re: [PATCH] meson.build: tweak sdl-image error message

Posted by Philippe Mathieu-Daudé 3 years, 7 months ago

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
>

Re: [PATCH] meson.build: tweak sdl-image error message

Posted by Paolo Bonzini 3 years, 7 months ago

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
>
>

Re: [PATCH] meson.build: tweak sdl-image error message

Posted by Laurent Vivier 3 years, 7 months ago

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