qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [PULL 10/14] meson: multiple names can be passed to dependency()
Date: Thu, 29 Sep 2022 18:30:10 +0200	[thread overview]
Message-ID: <20220929163014.16950-11-pbonzini@redhat.com> (raw)
In-Reply-To: <20220929163014.16950-1-pbonzini@redhat.com>

This is new in Meson 0.60.0.

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 meson.build | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/meson.build b/meson.build
index 8c1139a82b..48533ace7b 100644
--- a/meson.build
+++ b/meson.build
@@ -825,14 +825,10 @@ if have_system and get_option('curses').allowed()
     }'''
 
   curses_dep_list = targetos == 'windows' ? ['ncurses', 'ncursesw'] : ['ncursesw']
-  foreach curses_dep : curses_dep_list
-    if not curses.found()
-      curses = dependency(curses_dep,
-                          required: false,
-                          method: 'pkg-config',
-                          kwargs: static_kwargs)
-    endif
-  endforeach
+  curses = dependency(curses_dep_list,
+                      required: false,
+                      method: 'pkg-config',
+                      kwargs: static_kwargs)
   msg = get_option('curses').enabled() ? 'curses library not found' : ''
   curses_compile_args = ['-DNCURSES_WIDECHAR=1']
   if curses.found()
-- 
2.37.3



  parent reply	other threads:[~2022-09-29 17:21 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-29 16:30 [PULL 00/14] x86 + misc changes for 2022-09-29 Paolo Bonzini
2022-09-29 16:30 ` [PULL 01/14] x86: return modified setup_data only if read as memory, not as file Paolo Bonzini
2022-09-29 16:30 ` [PULL 02/14] x86: use typedef for SetupData struct Paolo Bonzini
2022-09-29 16:30 ` [PULL 03/14] x86: reinitialize RNG seed on system reboot Paolo Bonzini
2022-09-29 16:30 ` [PULL 04/14] x86: re-enable rng seeding via SetupData Paolo Bonzini
2022-09-29 16:30 ` [PULL 05/14] qboot: rebuild based on latest commit Paolo Bonzini
2022-09-29 16:30 ` [PULL 06/14] configure: do not invoke as/ld directly for pc-bios/optionrom Paolo Bonzini
2022-09-29 16:30 ` [PULL 07/14] watchdog: remove -watchdog option Paolo Bonzini
2022-09-29 16:30 ` [PULL 08/14] ui: fix path to dbus-display1.h Paolo Bonzini
2022-09-29 16:30 ` [PULL 09/14] meson: require 0.61.3 Paolo Bonzini
2022-09-29 16:30 ` Paolo Bonzini [this message]
2022-09-29 16:30 ` [PULL 11/14] configure, meson: move C++ compiler detection to meson.build Paolo Bonzini
2022-09-29 16:30 ` [PULL 12/14] configure, meson: move linker flag detection to meson Paolo Bonzini
2022-09-29 16:30 ` [PULL 13/14] target/i386/kvm: fix kvmclock_current_nsec: Assertion `time.tsc_timestamp <= migration_tsc' failed Paolo Bonzini
2022-09-29 16:30 ` [PULL 14/14] x86: re-initialize RNG seed when selecting kernel Paolo Bonzini
2022-09-29 21:02 ` [PULL 00/14] x86 + misc changes for 2022-09-29 Stefan Hajnoczi

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=20220929163014.16950-11-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /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).