[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/18] meson.build: tweak sdl-image error message
From: |
Laurent Vivier |
Subject: |
[PULL 10/18] meson.build: tweak sdl-image error message |
Date: |
Fri, 11 Sep 2020 21:33:22 +0200 |
From: Sergei Trofimovich <slyfox@gentoo.org>
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>
Message-Id: <20200908074016.2593596-1-slyfox@gentoo.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 5421eca66a02..9dec3f5b2d4f 100644
--- a/meson.build
+++ b/meson.build
@@ -273,8 +273,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.26.2
- [PULL 08/18] hw/net/e1000e: Remove overwritten read handler for STATUS register, (continued)
- [PULL 08/18] hw/net/e1000e: Remove overwritten read handler for STATUS register, Laurent Vivier, 2020/09/11
- [PULL 09/18] hw/net/e1000e: Remove duplicated write handler for FLSWDATA register, Laurent Vivier, 2020/09/11
- [PULL 01/18] hw/mips/fuloong2e: Convert pointless error message to an assert(), Laurent Vivier, 2020/09/11
- [PULL 07/18] Makefile: Skip the meson subdir in cscope/TAGS/ctags, Laurent Vivier, 2020/09/11
- [PULL 11/18] kconfig: fix comment referring to old Makefiles, Laurent Vivier, 2020/09/11
- [PULL 12/18] hw: hyperv: vmbus: Fix 32bit compilation, Laurent Vivier, 2020/09/11
- [PULL 14/18] target/i386/kvm: Rename host_tsx_blacklisted() as host_tsx_broken(), Laurent Vivier, 2020/09/11
- [PULL 15/18] hw/arm/pxa2xx: Add missing fallthrough comment, Laurent Vivier, 2020/09/11
- [PULL 18/18] target/i386/kvm: Add missing fallthrough comment, Laurent Vivier, 2020/09/11
- [PULL 13/18] test-vmstate: remove unnecessary code in match_interval_mapping_node, Laurent Vivier, 2020/09/11
- [PULL 10/18] meson.build: tweak sdl-image error message,
Laurent Vivier <=
- [PULL 17/18] util/hexdump: Reorder qemu_hexdump() arguments, Laurent Vivier, 2020/09/11
- [PULL 16/18] util/hexdump: Convert to take a void pointer argument, Laurent Vivier, 2020/09/11
- Re: [PULL 00/18] Trivial branch for 5.2 patches, Peter Maydell, 2020/09/12